Hello community, here is the log from the commit of package python-txaio for openSUSE:Factory checked in at 2019-09-16 10:50:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-txaio (Old) and /work/SRC/openSUSE:Factory/.python-txaio.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-txaio" Mon Sep 16 10:50:36 2019 rev:5 rq:730692 version:18.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-txaio/python-txaio.changes 2019-09-07 11:50:59.194294899 +0200 +++ /work/SRC/openSUSE:Factory/.python-txaio.new.7948/python-txaio.changes 2019-09-16 10:50:38.223170410 +0200 @@ -1,0 +2,6 @@ +Fri Sep 13 11:40:25 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to build with newer pytest releases: + * pytest4.patch + +------------------------------------------------------------------- New: ---- pytest4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-txaio.spec ++++++ --- /var/tmp/diff_new_pack.Yrfaak/_old 2019-09-16 10:50:38.775170338 +0200 +++ /var/tmp/diff_new_pack.Yrfaak/_new 2019-09-16 10:50:38.775170338 +0200 @@ -23,10 +23,10 @@ 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 @@ 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 @@ %prep %setup -q -n txaio-%{version} +%autopatch -p1 %build %python_build @@ -61,7 +63,7 @@ %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 ++++++ pytest4.patch ++++++ >From 9217f054b7eccc120f84e01995479125e07de59a Mon Sep 17 00:00:00 2001 From: meejah <[email protected]> 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
