!12 Update to 1.7.1

Merge pull request !12 from ultra_planet/master

0001-Fix-random-test-failure.patch

@@ -1,24 +0,0 @@
-From ec0449b686c846ad30ee23b558d8ff9ed1b73031 Mon Sep 17 00:00:00 2001
-From: lyn1001 <thistleslyn@163.com>
-Date: Tue, 26 May 2020 18:50:48 +0800
-Subject: [PATCH] Fix random test failure
-
----
- execnet-1.5.0/testing/test_xspec.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/execnet-1.5.0/testing/test_xspec.py b/execnet-1.5.0/testing/test_xspec.py
-index cbb2055..4244f2d 100644
---- a/execnet-1.5.0/testing/test_xspec.py
-+++ b/execnet-1.5.0/testing/test_xspec.py
-@@ -124,6 +124,7 @@ class TestMakegateway:
-         assert rinfo.version_info == sys.version_info
- 
-     @pytest.mark.skipif("not hasattr(os, 'nice')")
-+    @pytest.mark.xfail(reason='fails due to timing problems on busy single-core VMs')
-     def test_popen_nice(self, makegateway):
-         gw = makegateway("popen")
- 
--- 
-2.23.0
-

0001-fix-asserterror-for-testcase.patch

@@ -1,28 +0,0 @@
-From d331d7ff6d84dd51ecc3713614834ed07e20f2e4 Mon Sep 17 00:00:00 2001
-From: wwx913452 <wangerfeng5@huawei.com>
-Date: Fri, 22 May 2020 17:02:49 +0800
-Subject: [PATCH] fix asserterror for testcase
-
----
- python2/testing/test_termination.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/execnet-1.5.0/testing/test_termination.py b/execnet-1.5.0/testing/test_termination.py
-index 29ede00..955bec4 100644
---- a/execnet-1.5.0/testing/test_termination.py
-+++ b/execnet-1.5.0/testing/test_termination.py
-@@ -87,7 +87,10 @@ def test_close_initiating_remote_no_error(testdir, anypython):
-         x for x in err.splitlines()
-         if '*sys-package' not in x]
-     # print (lines)
--    assert not lines
-+    try:
-+        assert not lines
-+    except AssertionError:
-+        print ()
-
- 
- def test_terminate_implicit_does_trykill(testdir, anypython, capfd, pool):
--- 
-2.23.0
-

python-execnet.spec

@@ -1,14 +1,12 @@
 Name:           python-execnet
-Version:        1.5.0
+Version:        1.7.1
-Release:        6
+Release:        1
 Summary:        Rapid multi-Python deployment
 License:        MIT and GPLv2+
 URL:            http://codespeak.net/execnet
 Source0:        https://pypi.io/packages/source/e/execnet/execnet-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  procps-ng
-Patch0001:      0001-fix-asserterror-for-testcase.patch
-Patch0002:      0001-Fix-random-test-failure.patch
 %description
 execnet provides carefully tested means to ad-hoc interact with Python interpreters across version,
 platform and network barriers. It provides a minimal and fast API targetting the following uses:
@@ -16,25 +14,10 @@ distribute tasks to local or remote processes
 write and deploy hybrid multi-process applications
 write scripts to administer multiple hosts
 
-%package   -n   python2-execnet
-Summary:        Rapid multi-Python deployment
-BuildRequires:  python2-apipkg python2-devel python2-eventlet python2-gevent >= 1.0
-BuildRequires:  python2-pytest python2-setuptools python2-setuptools_scm python2-sphinx
-Requires:       python2-setuptools python2-apipkg
-%{?python_provide:%python_provide python2-execnet}
-
-%description -n python2-execnet
-execnet provides carefully tested means to ad-hoc interact with Python interpreters across version,
-platform and network barriers. It provides a minimal and fast API targetting the following uses:
-distribute tasks to local or remote processes
-write and deploy hybrid multi-process applications
-write scripts to administer multiple hosts
-
 %package   -n   python3-execnet
 Summary:        Rapid multi-Python deployment
 BuildRequires:  python3-apipkg python3-devel python3-pytest python3-setuptools
 BuildRequires:  python3-setuptools_scm python3-sphinx
-Requires:       python3-setuptools python3-apipkg
 %{?python_provide:%python_provide python3-execnet}
 
 %description -n python3-execnet
@@ -45,65 +28,37 @@ write and deploy hybrid multi-process applications
 write scripts to administer multiple hosts
 
 %prep
-%autosetup -c execnet-%{version} -p1
+%autosetup -n execnet-%{version} -p1
 
-mv execnet-%{version} python2
-cd python2
 find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
    -exec sed -i '1{/^#!/d}' {} \; \
    -exec chmod 644 {} \;
-cd -
-cp -a python2 python3
 
 %build
 SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
-
-cd python2
-%py2_build
-make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-2
-cd -
-
-cd python3
 %py3_build
-make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
+make -C doc html PYTHONPATH=$(pwd)
-cd -
+rm -f doc/_build/html/.buildinfo
 
 %install
 SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
-
-cd python2
-%py2_install
-rm -f doc/_build/html/.buildinfo
-cd -
-
-cd python3
 %py3_install
-rm -f doc/_build/html/.buildinfo
-cd -
 
 %check
-cd python2
-PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" py.test-%{python2_version} -r s -k 'not test_stdouterrin_setnull' testing
-cd -
-
-cd python3
 PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" py.test-%{python3_version} -r s -k 'not test_stdouterrin_setnull' testing
-cd -
-
-%files -n python2-execnet
-%license python2/LICENSE
-%doc python2/*.rst
-%doc python2/doc/_build/html
-%{python2_sitelib}/execnet*
 
 %files -n python3-execnet
-%license python3/LICENSE
+%license LICENSE
-%doc python3/*.rst
+%doc README.rst CHANGELOG.rst
-%doc python3/doc/_build/html
+%doc doc/_build/html
 %{python3_sitelib}/execnet*
 
 %changelog
+* Mon Aug 10 2020 lingsheng <lingsheng@huawei.com> - 1.7.1-1
+- Update to 1.7.1
+
 * Thu May 21 2020 yanan li <liyanan032@huawei.com> - 1.5.0-6
 - Fix asserterror for testcase.
+
 * Wed Mar 4 2020 zhouyihang<zhouyihang1@huawei.com> - 1.5.0-5
 - Pakcage init