From 6120e1a2088d655ff2fa1c4e5fc0d5791d6ac7985c1853cb9e06a1c30bdadf5a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 8 Aug 2018 12:45:56 +0000 Subject: [PATCH] Accepting request 628060 from devel:languages:python - add fix_apipkg.patch -- fixes tests with apipkg > 1.4.0 (forwarded request 628059 from mimi_vx) OBS-URL: https://build.opensuse.org/request/show/628060 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-execnet?expand=0&rev=6 --- fix_apipkg.patch | 29 +++++++++++++++++++++++++++++ python-execnet.changes | 5 +++++ python-execnet.spec | 4 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 fix_apipkg.patch diff --git a/fix_apipkg.patch b/fix_apipkg.patch new file mode 100644 index 0000000..69b3a89 --- /dev/null +++ b/fix_apipkg.patch @@ -0,0 +1,29 @@ +From a59f30af7cfbeed4666cc978913dfde66ca9f571 Mon Sep 17 00:00:00 2001 +From: Anthony Sottile +Date: Thu, 5 Jul 2018 15:14:35 -0700 +Subject: [PATCH] Don't copy apipkg into the test dir -- it isn't a single file + any more + +--- + testing/test_termination.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/testing/test_termination.py b/testing/test_termination.py +index 7320cdf..ae905d4 100644 +--- a/testing/test_termination.py ++++ b/testing/test_termination.py +@@ -1,6 +1,5 @@ + import pytest + import execnet +-import apipkg + import subprocess + import py + import sys +@@ -76,7 +75,6 @@ def test_close_initiating_remote_no_error(testdir, anypython): + print ("termination") + execnet.default_group.terminate() + """) +- testdir.makepyfile(apipkg=apipkg) + popen = subprocess.Popen( + [str(anypython), str(p), str(execnetdir)], + stdout=None, stderr=subprocess.PIPE,) diff --git a/python-execnet.changes b/python-execnet.changes index f6d70a9..7307800 100644 --- a/python-execnet.changes +++ b/python-execnet.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 8 11:32:26 UTC 2018 - mimi.vx@gmail.com + +- add fix_apipkg.patch -- fixes tests with apipkg > 1.4.0 + ------------------------------------------------------------------- Sun Jul 15 23:10:06 UTC 2018 - mimi.vx@gmail.com diff --git a/python-execnet.spec b/python-execnet.spec index a685545..e00871b 100644 --- a/python-execnet.spec +++ b/python-execnet.spec @@ -25,9 +25,10 @@ License: MIT Group: Development/Libraries/Python URL: http://codespeak.net/execnet/ Source0: https://files.pythonhosted.org/packages/source/e/execnet/execnet-%{version}.tar.gz +Patch0: fix_apipkg.patch # test requirements BuildRequires: %{python_module apipkg} -BuildRequires: %{python_module devel} +BuildRequires: %{python_module base} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} @@ -50,6 +51,7 @@ 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