From 4d6c6ab3e04ca2034b69a187181ee7a305e6442d38260988f427944b175b3854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 6 Mar 2019 19:49:26 +0000 Subject: [PATCH 1/2] - Update to 0.54.0: * many fixes all around, see ChangeLog file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=30 --- python-websocket-client.changes | 6 ++++++ python-websocket-client.spec | 15 ++++---------- use_system_cabundle.patch | 35 --------------------------------- websocket_client-0.46.0.tar.gz | 3 --- websocket_client-0.54.0.tar.gz | 3 +++ 5 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 use_system_cabundle.patch delete mode 100644 websocket_client-0.46.0.tar.gz create mode 100644 websocket_client-0.54.0.tar.gz diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 75e6f62..8219771 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 6 19:47:18 UTC 2019 - Tomáš Chvátal + +- Update to 0.54.0: + * many fixes all around, see ChangeLog file + ------------------------------------------------------------------- Tue Dec 4 12:55:59 UTC 2018 - Matej Cepl diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 3c46fd0..91a350a 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -1,7 +1,7 @@ # # spec file for package python-websocket-client # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,17 +23,14 @@ %else %define ssl_match_hostname python-backports.ssl_match_hostname %endif -%bcond_without test Name: python-websocket-client -Version: 0.46.0 +Version: 0.54.0 Release: 0 Summary: WebSocket client implementation License: LGPL-2.1-only Group: Development/Languages/Python URL: https://github.com/liris/websocket-client/releases Source0: https://files.pythonhosted.org/packages/source/w/websocket_client/websocket_client-%{version}.tar.gz -# PATCH-FIX-OPENSUSE use_system_cabundle.patch bnc#1076519 -Patch0: use_system_cabundle.patch BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: %{ssl_match_hostname} @@ -58,21 +55,17 @@ Websocket-client supports only hybi-13. %prep %setup -q -n websocket_client-%{version} -%patch0 -p1 %build %python_build %install %python_install +%python_expand %fdupes %{buildroot}/%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/wsdump.py -%python_expand %fdupes %{buildroot}/%{$python_sitelib} - -%if %{with test} %check %python_exec websocket/tests/test_websocket.py -%endif %post %python_install_alternative wsdump.py @@ -82,7 +75,7 @@ Websocket-client supports only hybi-13. %files %{python_files} %license LICENSE -%doc README.rst +%doc README.rst ChangeLog %python_alternative %{_bindir}/wsdump.py %{python_sitelib}/websocket/ %{python_sitelib}/websocket_client-%{version}-py*.egg-info diff --git a/use_system_cabundle.patch b/use_system_cabundle.patch deleted file mode 100644 index 3d701d7..0000000 --- a/use_system_cabundle.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2017-12-24 07:47:39.000000000 +0100 -+++ b/setup.py 2018-01-18 10:54:20.090661863 +0100 -@@ -63,7 +63,6 @@ - packages=["websocket", "websocket.tests"], - package_data={ - 'websocket.tests': ['data/*.txt'], -- 'websocket': ["cacert.pem"] - }, - tests_require=tests_require, - test_suite="websocket.tests" -diff -Naur a/websocket/_http.py b/websocket/_http.py ---- a/websocket/_http.py 2017-12-09 08:07:42.000000000 +0100 -+++ b/websocket/_http.py 2018-01-18 10:55:01.854569515 +0100 -@@ -176,8 +176,7 @@ - if os.environ.get('WEBSOCKET_CLIENT_CA_BUNDLE'): - certPath = os.environ.get('WEBSOCKET_CLIENT_CA_BUNDLE') - else: -- certPath = os.path.join( -- os.path.dirname(__file__), "cacert.pem") -+ certPath = ssl.get_default_verify_paths().cafile - if os.path.isfile(certPath) and user_sslopt.get('ca_certs', None) is None \ - and user_sslopt.get('ca_cert', None) is None: - sslopt['ca_certs'] = certPath -diff -Naur a/websocket_client.egg-info/SOURCES.txt b/websocket_client.egg-info/SOURCES.txt ---- a/websocket_client.egg-info/SOURCES.txt 2017-12-30 12:28:30.000000000 +0100 -+++ b/websocket_client.egg-info/SOURCES.txt 2018-01-18 10:54:31.166637627 +0100 -@@ -20,7 +20,6 @@ - websocket/_ssl_compat.py - websocket/_url.py - websocket/_utils.py --websocket/cacert.pem - websocket/tests/__init__.py - websocket/tests/test_cookiejar.py - websocket/tests/test_websocket.py diff --git a/websocket_client-0.46.0.tar.gz b/websocket_client-0.46.0.tar.gz deleted file mode 100644 index 341566a..0000000 --- a/websocket_client-0.46.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:933f6bbf08b381f2adbca9e93d7e7958ba212b42c73acb310b18f0fbe74f3738 -size 203950 diff --git a/websocket_client-0.54.0.tar.gz b/websocket_client-0.54.0.tar.gz new file mode 100644 index 0000000..d597ac8 --- /dev/null +++ b/websocket_client-0.54.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 +size 36413 From 9fb1a8dd456a628d039e46eac489c752c211dcd0fd573959e2086af8a5d2b837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 22 Mar 2019 11:42:31 +0000 Subject: [PATCH 2/2] - Drop merged use_system_cabundle.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=31 --- python-websocket-client.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 8219771..4409234 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -3,6 +3,7 @@ Wed Mar 6 19:47:18 UTC 2019 - Tomáš Chvátal - Update to 0.54.0: * many fixes all around, see ChangeLog file +- Drop merged use_system_cabundle.patch ------------------------------------------------------------------- Tue Dec 4 12:55:59 UTC 2018 - Matej Cepl