Update to 1.3.0.

- Drop obsolete patches.

7 files changed, 23 insertions, 121 deletions

diff --git a/.gitignore b/.gitignore
index 952a824..bf5cd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /execnet-1.0.9.zip
 /execnet-1.1.zip
 /execnet-1.2.0.tar.gz
+/execnet-1.3.0.tar.gz
diff --git a/execnet-1.1-issue9.patch b/execnet-1.1-issue9.patch
deleted file mode 100644
index ee321b1..0000000
--- a/execnet-1.1-issue9.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-# HG changeset patch
-# User Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
-# Date 1346694793 -7200
-# Node ID 49c5934137e5f8ac9d16ea96ac2a5c01149ad190
-# Parent  ec10c11ac8eb248a995c70ad2fee426315249f33
-fix issue #9 - terminate the worker threadpools in safe_terminate
-
-diff -r ec10c11ac8eb248a995c70ad2fee426315249f33 -r 49c5934137e5f8ac9d16ea96ac2a5c01149ad190 CHANGELOG
---- a/CHANGELOG	Wed Jun 20 18:16:40 2012 +0200
-+++ b/CHANGELOG	Mon Sep 03 19:53:13 2012 +0200
-@@ -23,6 +23,8 @@
- - fix issue #2 - properly reconfigure the channels string coercion for rsync,
-   so it can send from python2 to python3
- 
-+- fix issue #9 - propperly terminate the worker threadpools in safe_terminate
-+
- - refactor socketserver, so it can be directly remote_exec'd for starting a socket gateway on a remote
- 
- 
-diff -r ec10c11ac8eb248a995c70ad2fee426315249f33 -r 49c5934137e5f8ac9d16ea96ac2a5c01149ad190 execnet/multi.py
---- a/execnet/multi.py	Wed Jun 20 18:16:40 2012 +0200
-+++ b/execnet/multi.py	Mon Sep 03 19:53:13 2012 +0200
-@@ -252,6 +252,8 @@
-         replylist.append(reply)
-     for reply in replylist:
-         reply.get()
-+    workerpool.shutdown()
-+    workerpool.join()
- 
- 
- default_group = Group()
-diff -r ec10c11ac8eb248a995c70ad2fee426315249f33 -r 49c5934137e5f8ac9d16ea96ac2a5c01149ad190 testing/test_multi.py
---- a/testing/test_multi.py	Wed Jun 20 18:16:40 2012 +0200
-+++ b/testing/test_multi.py	Mon Sep 03 19:53:13 2012 +0200
-@@ -2,6 +2,8 @@
-     tests for multi channels and gateway Groups
- """
- 
-+import threading
-+from time import sleep
- import execnet
- import py
- from execnet.gateway_base import Channel
-@@ -193,6 +195,7 @@
- 
- 
- def test_safe_terminate():
-+    active = threading.active_count()
-     l = []
-     def term():
-         py.std.time.sleep(3)
-@@ -200,8 +203,12 @@
-         l.append(1)
-     safe_terminate(1, [(term, kill)] * 10)
-     assert len(l) == 10
-+    sleep(0.1)
-+    py.std.gc.collect()
-+    assert threading.active_count() == active
- 
- def test_safe_terminate2():
-+    active = threading.active_count()
-     l = []
-     def term():
-         return
-@@ -209,3 +216,6 @@
-         l.append(1)
-     safe_terminate(3, [(term, kill)] * 10)
-     assert len(l) == 0
-+    sleep(0.1)
-+    py.std.gc.collect()
-+    assert threading.active_count() == active
diff --git a/python-execnet-fix-test-channel-on-python-3.4.patch b/python-execnet-fix-test-channel-on-python-3.4.patch
deleted file mode 100644
index 87e0ecc..0000000
--- a/python-execnet-fix-test-channel-on-python-3.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Robert Kuska <rkuska@redhat.com>
-# Date 1400488914 -7200
-# Node ID 8b3f3a14d53c561f0bae1990dc251d5fde09432e
-# Parent  6f3729e2c7eb97616a71b8f917b4f4986dfdd8b7
-Fixes test in test_channel according the new exec traceback in py3.4
-
-diff --git a/testing/test_channel.py b/testing/test_channel.py
---- a/testing/test_channel.py
-+++ b/testing/test_channel.py
-@@ -72,9 +72,10 @@
-             channel.receive()
-         except channel.RemoteError:
-             e = sys.exc_info()[1]
-+            print(e)
-             assert str(e).startswith('Traceback (most recent call last):')
--            assert str(e).find('NameError: global name \'foobar\' '
--                               'is not defined') > -1
-+            assert str(e).find('NameError') > -1
-+            assert str(e).find('foobar') > -1
-         else:
-             pytest.fail('No exception raised')
- 
diff --git a/python-execnet-remove-hgdistver-dep.patch b/python-execnet-remove-hgdistver-dep.patch
new file mode 100644
index 0000000..465d3cb
--- /dev/null
+++ b/python-execnet-remove-hgdistver-dep.patch
@@ -0,0 +1,12 @@
+diff -up execnet-1.3.0/setup.py.orig execnet-1.3.0/setup.py
+--- execnet-1.3.0/setup.py.orig	2015-03-08 12:38:03.021618008 +0100
++++ execnet-1.3.0/setup.py	2015-03-08 12:45:21.326035058 +0100
+@@ -63,7 +63,7 @@ def main():
+         setup_requires=[
+             # this is a setup/release time dependency
+             # we are supposed to use wheels
+-            'hgdistver',
++            #'hgdistver',
+         ]
+     )
+ 
diff --git a/python-execnet-remove-redundant-print-statement.patch b/python-execnet-remove-redundant-print-statement.patch
deleted file mode 100644
index cc2b38b..0000000
--- a/python-execnet-remove-redundant-print-statement.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# HG changeset patch
-# User Robert Kuska <rkuska@redhat.com>
-# Date 1400489832 -7200
-# Node ID 47ff3652b0aed191f7bafc741c211d1415f65224
-# Parent  8b3f3a14d53c561f0bae1990dc251d5fde09432e
-Remove redudant print statement
-
-diff --git a/testing/test_channel.py b/testing/test_channel.py
---- a/testing/test_channel.py
-+++ b/testing/test_channel.py
-@@ -72,7 +72,6 @@
-             channel.receive()
-         except channel.RemoteError:
-             e = sys.exc_info()[1]
--            print(e)
-             assert str(e).startswith('Traceback (most recent call last):')
-             assert str(e).find('NameError') > -1
-             assert str(e).find('foobar') > -1
diff --git a/python-execnet.spec b/python-execnet.spec
index 0f89049..35661c1 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -8,8 +8,8 @@
 %global srcname execnet
 
 Name:           python-%{srcname}
-Version:        1.2.0
-Release:        5%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Elastic Python Deployment
 Group:          Development/Languages
 # package is now under the MIT license, (although the docs still say
@@ -18,12 +18,10 @@ Group:          Development/Languages
 License:        MIT and GPLv2+
 URL:            http://codespeak.net/execnet
 Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.tar.gz
-# https://bitbucket.org/hpk42/execnet/pull-request/10/fixes-test-in-test_channel-according-the/diff
-Patch0:         python-execnet-fix-test-channel-on-python-3.4.patch
-# https://bitbucket.org/hpk42/execnet/pull-request/11/remove-redudant-print-statement/diff
-Patch1:         python-execnet-remove-redundant-print-statement.patch
 # pytest is too old in EL7 - this patch removes the failing @needssymlink decorator
 Patch2:         python-execnet-needssymlink.patch
+# hgdistver is only needed by upstream at release time
+Patch3:         python-execnet-remove-hgdistver-dep.patch
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -79,9 +77,8 @@ minimal and fast API targetting the following uses:
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # remove shebangs and fix permissions
 find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
@@ -143,6 +140,10 @@ popd
 
 
 %changelog
+* Sun Mar  8 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.3.0-1
+- Update to 1.3.0.
+- Drop obsolete patches.
+
 * Mon Jan 19 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.2.0-5
 - Bump and rebuild in rawhide.
 
diff --git a/sources b/sources
index 8a9602a..bf35370 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1886d12726b912fc2fd05dfccd7e6432  execnet-1.2.0.tar.gz
+426c1a963cee5f671a3e8187b983c915  execnet-1.3.0.tar.gz