diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index 44b844b..0000000 --- a/pytest4.patch +++ /dev/null @@ -1,47 +0,0 @@ -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.changes b/python-txaio.changes index 63fc970..f5eaccb 100644 --- a/python-txaio.changes +++ b/python-txaio.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 5 13:11:01 UTC 2020 - Ondřej Súkup + +- update to 20.1.1 +- drop pytest4.patch + * new: moved time_ns and perf_counter_ns helper functions here + * drop support for python 3.4 and older + ------------------------------------------------------------------- Fri Sep 13 11:40:25 UTC 2019 - Tomáš Chvátal diff --git a/python-txaio.spec b/python-txaio.spec index 4fed89c..9c3e646 100644 --- a/python-txaio.spec +++ b/python-txaio.spec @@ -1,7 +1,7 @@ # # spec file for package python-txaio # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,24 @@ # +%define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-txaio -Version: 18.8.1 +Version: 20.1.1 Release: 0 Summary: WebSocket and WAMP in Python for Twisted and asyncio License: MIT Group: Development/Languages/Python 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: fdupes BuildRequires: python-rpm-macros -BuildRequires: python2-devel 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 # SECTION test requirements BuildRequires: %{python_module Twisted >= 12.1.0} BuildRequires: %{python_module mock} @@ -53,7 +48,6 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket. %prep %setup -q -n txaio-%{version} -%autopatch -p1 %build %python_build diff --git a/txaio-18.8.1.tar.gz b/txaio-18.8.1.tar.gz deleted file mode 100644 index abda86e..0000000 --- a/txaio-18.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe -size 51092 diff --git a/txaio-20.1.1.tar.gz b/txaio-20.1.1.tar.gz new file mode 100644 index 0000000..0d50384 --- /dev/null +++ b/txaio-20.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f24e10396f026c75364ae23ffac8d72c156dc5f3733d332febb356c9d8d6b58d +size 53391