python/python-autobahn
SHA256
15
0
Fork 0
forked from pool/python-autobahn
Code Pull Requests Activity

- Add remove-unittest2.patch which remove dependency on unittest2

Browse Source 
(filed upstream https://github.com/crossbario/autobahn-python/issues/1036)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-autobahn?expand=0&rev=6
This commit is contained in:
Matej Cepl
2018-08-10 11:23:53 +00:00
committed by Git OBS Bridge
parent 09e8b1805e
commit 25323c7e8c
3 changed files with 152 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python-autobahn.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 10 11:22:33 UTC 2018 - mcepl@suse.com
- Add remove-unittest2.patch which remove dependency on unittest2
(filed upstream https://github.com/crossbario/autobahn-python/issues/1036)
-------------------------------------------------------------------
Mon Mar 12 09:11:02 UTC 2018 - tchvatal@suse.com

5
python-autobahn.spec
View File

@@ -26,11 +26,13 @@ License: MIT
Group: Development/Languages/Python
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: %{python_module unittest2}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python-trollius
@@ -54,6 +56,7 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket.
%prep
%setup -q -n autobahn-%{version}
%patch0 -p1
%build
%python_build

142
remove-unittest2.patch Normal file
View File

@@ -0,0 +1,142 @@
--- 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