From 97745b29fa5c836438b3320ee9e793fff7013ece8851bf8db476135c0f4b4666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Oct 2018 09:30:43 +0000 Subject: [PATCH] - Update to 18.9.2: * Various fixes all around * Support python 3.7 - remove-unittest2.patch was merged upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-autobahn?expand=0&rev=8 --- autobahn-17.10.1.tar.gz | 3 - autobahn-18.9.2.tar.gz | 3 + python-autobahn.changes | 8 +++ python-autobahn.spec | 18 ++--- remove-unittest2.patch | 142 ---------------------------------------- 5 files changed, 18 insertions(+), 156 deletions(-) delete mode 100644 autobahn-17.10.1.tar.gz create mode 100644 autobahn-18.9.2.tar.gz delete mode 100644 remove-unittest2.patch diff --git a/autobahn-17.10.1.tar.gz b/autobahn-17.10.1.tar.gz deleted file mode 100644 index 381e160..0000000 --- a/autobahn-17.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cf74132a18da149c5ea3dcbb5e055f6f4fe5a0238b33258d29e89bd276a8078 -size 212093 diff --git a/autobahn-18.9.2.tar.gz b/autobahn-18.9.2.tar.gz new file mode 100644 index 0000000..cb626fa --- /dev/null +++ b/autobahn-18.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98b924f06865700116ee616027e4a6d678004a7b44e0d01cb262eab333112d6 +size 225185 diff --git a/python-autobahn.changes b/python-autobahn.changes index 693df21..c2814d9 100644 --- a/python-autobahn.changes +++ b/python-autobahn.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 18 09:23:10 UTC 2018 - Tomáš Chvátal + +- Update to 18.9.2: + * Various fixes all around + * Support python 3.7 +- remove-unittest2.patch was merged upstream + ------------------------------------------------------------------- Fri Aug 10 11:22:33 UTC 2018 - mcepl@suse.com diff --git a/python-autobahn.spec b/python-autobahn.spec index eeda960..ce47334 100644 --- a/python-autobahn.spec +++ b/python-autobahn.spec @@ -12,30 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} %{!?skip_python3:python3-%{**}}} -%define oldpython python Name: python-autobahn -Version: 17.10.1 +Version: 18.9.2 Release: 0 Summary: WebSocket and WAMP in Python for Twisted and asyncio License: MIT Group: Development/Languages/Python -Url: http://crossbar.io/autobahn +URL: http://crossbar.io/autobahn Source: https://files.pythonhosted.org/packages/source/a/autobahn/autobahn-%{version}.tar.gz -# PATCH-FIX-UPSTREAM mcepl@suse.cz remove-unittest2.patch -# https://github.com/crossbario/autobahn-python/issues/1036 -Patch0: remove-unittest2.patch -BuildRequires: %{python_module devel} BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python-trollius +BuildRequires: python2-trollius +BuildRequires: python3-pytest-asyncio Requires: python-Twisted Requires: python-six Requires: python-txaio @@ -46,7 +42,7 @@ BuildRequires: %{python_module six >= 1.10.0} BuildRequires: %{python_module txaio} # /SECTION %ifpython2 -Requires: %{oldpython}-trollius +Requires: python-trollius %endif %python_subpackages @@ -56,7 +52,6 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket. %prep %setup -q -n autobahn-%{version} -%patch0 -p1 %build %python_build @@ -66,6 +61,7 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check +export USE_ASYNCIO=true %{python_expand PYTHONPATH=. $python -m pytest autobahn} %files %{python_files} diff --git a/remove-unittest2.patch b/remove-unittest2.patch deleted file mode 100644 index b84fdef..0000000 --- a/remove-unittest2.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/autobahn/rawsocket/test/test_rawsocket_url.py -+++ b/autobahn/rawsocket/test/test_rawsocket_url.py -@@ -26,7 +26,7 @@ - - from __future__ import absolute_import - --import unittest2 as unittest -+import unittest - - from autobahn.rawsocket.util import create_url, parse_url - ---- a/autobahn/test/test_util.py -+++ b/autobahn/test/test_util.py -@@ -26,7 +26,7 @@ - - from __future__ import absolute_import - --import unittest2 as unittest -+import unittest - - from autobahn.util import IdGenerator - ---- a/autobahn/wamp/test/test_auth.py -+++ b/autobahn/wamp/test/test_auth.py -@@ -26,7 +26,7 @@ - - from __future__ import absolute_import - --import unittest2 as unittest -+import unittest - import platform - - import six ---- a/autobahn/wamp/test/test_cryptosign.py -+++ b/autobahn/wamp/test/test_cryptosign.py -@@ -33,7 +33,7 @@ if HAS_CRYPTOSIGN: - - import tempfile - --import unittest2 as unittest -+import unittest - - keybody = '''-----BEGIN OPENSSH PRIVATE KEY----- - b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW ---- a/autobahn/wamp/test/test_message.py -+++ b/autobahn/wamp/test/test_message.py -@@ -30,7 +30,7 @@ from autobahn.wamp import role - from autobahn.wamp import message - from autobahn.wamp.exception import ProtocolError - --import unittest2 as unittest -+import unittest - - - class Foo(object): ---- a/autobahn/wamp/test/test_protocol_peer.py -+++ b/autobahn/wamp/test/test_protocol_peer.py -@@ -41,7 +41,7 @@ from autobahn.wamp import message - from autobahn.wamp import exception - from autobahn.wamp import protocol - --import unittest2 as unittest -+import unittest - - - class TestPeerExceptions(unittest.TestCase): ---- a/autobahn/wamp/test/test_runner.py -+++ b/autobahn/wamp/test/test_runner.py -@@ -27,7 +27,7 @@ - from __future__ import absolute_import, print_function - - import os --import unittest2 as unittest -+import unittest - from txaio.testutil import replace_loop - - if os.environ.get('USE_TWISTED', False): ---- a/autobahn/wamp/test/test_serializer.py -+++ b/autobahn/wamp/test/test_serializer.py -@@ -27,7 +27,7 @@ - from __future__ import absolute_import - - import os --import unittest2 as unittest -+import unittest - import six - - from autobahn.wamp import message ---- a/autobahn/wamp/test/test_uri_pattern.py -+++ b/autobahn/wamp/test/test_uri_pattern.py -@@ -29,7 +29,7 @@ from __future__ import absolute_import - from autobahn import wamp - from autobahn.wamp.uri import Pattern, RegisterOptions, SubscribeOptions - --import unittest2 as unittest -+import unittest - - - class TestUris(unittest.TestCase): ---- a/autobahn/websocket/test/test_protocol.py -+++ b/autobahn/websocket/test/test_protocol.py -@@ -28,7 +28,7 @@ from __future__ import absolute_import, - - from hashlib import sha1 - from base64 import b64encode --import unittest2 as unittest -+import unittest - - from autobahn.websocket.protocol import WebSocketServerProtocol - from autobahn.websocket.protocol import WebSocketServerFactory ---- a/autobahn/websocket/test/test_websocket_url.py -+++ b/autobahn/websocket/test/test_websocket_url.py -@@ -26,7 +26,7 @@ - - from __future__ import absolute_import - --import unittest2 as unittest -+import unittest - - from autobahn.websocket.util import create_url, parse_url - ---- a/setup.py -+++ b/setup.py -@@ -128,7 +128,6 @@ extras_require_dev = [ - "pyflakes>=1.0.0", # MIT license - "mock>=1.3.0", # BSD license - "pytest>=2.8.6", # MIT license -- "unittest2>=1.1.0", # BSD license - "twine>=1.6.5", # Apache 2.0 - 'sphinx>=1.2.3', # BSD - 'pyenchant>=1.6.6', # LGPL ---- a/autobahn/wamp/test/test_exception.py -+++ b/autobahn/wamp/test/test_exception.py -@@ -24,7 +24,7 @@ - # - ############################################################################### - --from unittest2 import TestCase -+from unittest import TestCase - from six import PY3 - - from autobahn.wamp.exception import ApplicationError