diff --git a/execnet-1.6.0.tar.gz b/execnet-1.6.0.tar.gz deleted file mode 100644 index 80d5c79..0000000 --- a/execnet-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3 -size 169744 diff --git a/execnet-1.6.1.tar.gz b/execnet-1.6.1.tar.gz new file mode 100644 index 0000000..a2027c1 --- /dev/null +++ b/execnet-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd10a5663f94d1235e6fbee86bc53e2f89b6f15e031e7e6d9e4bb345bcd7e52 +size 165813 diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index cc2573d..0000000 --- a/pytest4.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: execnet-1.6.0/testing/conftest.py -=================================================================== ---- execnet-1.6.0.orig/testing/conftest.py -+++ execnet-1.6.0/testing/conftest.py -@@ -83,8 +83,8 @@ def getsocketspec(config=None): - - - def pytest_generate_tests(metafunc): -- if 'gw' in metafunc.funcargnames: -- assert 'anypython' not in metafunc.funcargnames, "need combine?" -+ if 'gw' in metafunc.fixturenames: -+ assert 'anypython' not in metafunc.fixturenames, "need combine?" - if hasattr(metafunc.function, 'gwtypes'): - gwtypes = metafunc.function.gwtypes - elif hasattr(metafunc.cls, 'gwtype'): -@@ -92,7 +92,7 @@ def pytest_generate_tests(metafunc): - else: - gwtypes = ['popen', 'socket', 'ssh', 'proxy'] - metafunc.parametrize("gw", gwtypes, indirect=True) -- elif 'anypython' in metafunc.funcargnames: -+ elif 'anypython' in metafunc.fixturenames: - metafunc.parametrize( - "anypython", indirect=True, argvalues=( - 'sys.executable', 'python2.7', 'pypy', 'jython', diff --git a/python-execnet.changes b/python-execnet.changes index b09d8d6..168a54b 100644 --- a/python-execnet.changes +++ b/python-execnet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 24 08:57:00 UTC 2019 - Tomáš Chvátal + +- Update to 1.6.1: + * Internal change to avoid using deprecated funcargs name in pytest 5+. +- Obsoletes pytest4.patch + ------------------------------------------------------------------- Fri Jul 19 09:14:51 UTC 2019 - Tomáš Chvátal diff --git a/python-execnet.spec b/python-execnet.spec index 188030a..cea3430 100644 --- a/python-execnet.spec +++ b/python-execnet.spec @@ -18,14 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-execnet -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: Rapid multi-Python deployment License: MIT Group: Development/Libraries/Python URL: https://github.com/pytest-dev/execnet Source0: https://files.pythonhosted.org/packages/source/e/execnet/execnet-%{version}.tar.gz -Patch0: pytest4.patch BuildRequires: %{python_module apipkg} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm} @@ -50,7 +49,6 @@ API targetting the following uses: %prep %setup -q -n execnet-%{version} -%patch0 -p1 sed -i "1d" execnet/script/shell.py execnet/script/socketserver.py %build