From d3475d4578580800c42391cd596e1a8e274f7c7db73f6655928dd4122dab596e Mon Sep 17 00:00:00 2001
From: Yuchen Lin <mlin+factory@suse.de>
Date: Mon, 16 Sep 2019 08:50:36 +0000
Subject: [PATCH] Accepting request 730692 from devel:languages:python

- Add patch to build with newer pytest releases:
  * pytest4.patch

OBS-URL: https://build.opensuse.org/request/show/730692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-txaio?expand=0&rev=5
---
 pytest4.patch        | 47 ++++++++++++++++++++++++++++++++++++++++++++
 python-txaio.changes |  6 ++++++
 python-txaio.spec    | 12 ++++++-----
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 pytest4.patch

diff --git a/pytest4.patch b/pytest4.patch
new file mode 100644
index 0000000..44b844b
--- /dev/null
+++ b/pytest4.patch
@@ -0,0 +1,47 @@
+From 9217f054b7eccc120f84e01995479125e07de59a Mon Sep 17 00:00:00 2001
+From: meejah <meejah@meejah.ca>
+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.changes b/python-txaio.changes
index 1142374..63fc970 100644
--- a/python-txaio.changes
+++ b/python-txaio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 13 11:40:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to build with newer pytest releases:
+  * pytest4.patch
+
 -------------------------------------------------------------------
 Thu Sep  5 13:40:10 UTC 2019 - Todd R <toddrme2178@gmail.com>
 
diff --git a/python-txaio.spec b/python-txaio.spec
index 5377e46..4fed89c 100644
--- a/python-txaio.spec
+++ b/python-txaio.spec
@@ -23,10 +23,10 @@ Release:        0
 Summary:        WebSocket and WAMP in Python for Twisted and asyncio
 License:        MIT
 Group:          Development/Languages/Python
-URL:            http://crossbar.io/autobahn
+URL:            https://github.com/crossbario/txaio
 Source:         https://files.pythonhosted.org/packages/source/t/txaio/txaio-%{version}.tar.gz
+Patch0:         pytest4.patch
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module mock}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python2-devel
@@ -34,14 +34,15 @@ BuildRequires:  python3-testsuite
 Requires:       python-six
 Recommends:     python-Twisted >= 12.1.0
 Recommends:     python-zope.interface >= 3.6
+BuildArch:      noarch
 %ifpython2
 Requires:       python-future
 Recommends:     python-trollius
 %endif
-BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module Twisted >= 12.1.0}
-BuildRequires:  %{python_module pytest < 4}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module six}
 # /SECTION
 %python_subpackages
@@ -52,6 +53,7 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket.
 
 %prep
 %setup -q -n txaio-%{version}
+%autopatch -p1
 
 %build
 %python_build
@@ -61,7 +63,7 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_exec -m pytest -k 'not test_sdist'
+%pytest -k 'not test_sdist'
 
 %files %{python_files}
 %license LICENSE