diff --git a/9217f054b7eccc120f84e01995479125e07de59a.patch b/9217f054b7eccc120f84e01995479125e07de59a.patch new file mode 100644 index 0000000..dcf5e40 --- /dev/null +++ b/9217f054b7eccc120f84e01995479125e07de59a.patch @@ -0,0 +1,47 @@ +From 9217f054b7eccc120f84e01995479125e07de59a Mon Sep 17 00:00:00 2001 +From: meejah +Date: Fri, 22 Feb 2019 12:01:46 -0700 +Subject: [PATCH] make pytest happy + +--- + test/conftest.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/test/conftest.py b/test/conftest.py +index 4a225c8..a3ca2d6 100644 +--- a/test/conftest.py ++++ b/test/conftest.py +@@ -25,9 +25,9 @@ def framework(request): + + try: + if request.param == 'twisted': +- return framework_tx() ++ return _notfixture_framework_tx() + elif request.param == 'asyncio': +- return framework_aio() ++ return _notfixture_framework_aio() + except ImportError: + pytest.skip() + +@@ -43,6 +43,10 @@ def framework_uninitialized(): + + @pytest.fixture + def framework_tx(): ++ return _notfixture_framework_tx() ++ ++ ++def _notfixture_framework_tx(): + try: + import txaio + from txaio import tx +@@ -56,6 +60,10 @@ def framework_tx(): + + @pytest.fixture + def framework_aio(): ++ return _notfixture_framework_aio() ++ ++ ++def _notfixture_framework_aio(): + try: + import txaio + from txaio import aio diff --git a/python-txaio.spec b/python-txaio.spec index 63f35f9..59a0e68 100644 --- a/python-txaio.spec +++ b/python-txaio.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 18.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compatibility API between asyncio/Twisted/Trollius License: MIT @@ -13,6 +13,7 @@ Patch0: python-txaio-skip-packaging-tests.patch # and is undocumented intentionaly because it's private. # This is a hack that calls stop on the loop soon after calling run_forever(). Patch2: run_once.patch +Patch3: https://github.com/crossbario/txaio/commit/9217f054b7eccc120f84e01995479125e07de59a.patch BuildArch: noarch @@ -55,6 +56,7 @@ asyncio. Documentation in html format. %setup -qn %{pypi_name}-%{version} %patch0 %patch2 -p1 +%patch3 -p1 # Remove upstream's egg-info rm -rf %{pypi_name}.egg-info @@ -99,6 +101,9 @@ PYTHONPATH=$PYTHONPATH:$(pwd):$(pwd)/test coverage3 run -p --source=txaio /usr/b %changelog +* Sat Jul 13 2019 Julien Enselme - 18.8.1-3 +- Fix tests after pytest update. + * Sat Mar 23 2019 Julien Enselme - 18.8.1-2 - Remove Python 2 subpackage.