Accepting request 578994 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/578994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-websocket-client?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2018-02-22 14:03:54 +00:00 committed by Git OBS Bridge
commit 063a552ed6
5 changed files with 60 additions and 9 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jan 18 09:55:12 UTC 2018 - sebix+novell.com@sebix.at
- update to version 0.46.0 (shortened):
- fixed invalid character (#379)
- update to version 0.45.0 (shortened):
- change license to LGP v2.1
- allow reuse of WebsocketApp.run_forever (#365)
- Parse close frame response correctly when reason present (#354)
- Wrap socket.gaierror with subclass of WebsocketException (#352)
- Resolve a proxy issue and a connection error (#345)
- Allow empty Host header value (#369)
- Fix undefined variable (#347)
- fix: getting a value with the key 'ca_certs' in sslopt dict (#326)
- Add use_system_cabundle.patch to use systems ca bundle file by default (bnc#1076519)
-------------------------------------------------------------------
Tue Sep 5 07:57:36 UTC 2017 - dmueller@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-websocket-client
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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
@ -26,13 +26,15 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-websocket-client
Version: 0.44.0
Version: 0.46.0
Release: 0
Summary: WebSocket client implementation
License: LGPL-3.0
License: LGPL-2.1
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: %ssl_match_hostname
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
@ -59,6 +61,7 @@ Websocket-client supports only hybi-13.
%prep
%setup -q -n websocket_client-%{version}
%patch0 -p1
%build
%python_build
@ -67,9 +70,6 @@ Websocket-client supports only hybi-13.
%python_install
%python_clone -a %{buildroot}%{_bindir}/wsdump.py
# Use the system certs
%python_expand rm %{buildroot}/%{$python_sitelib}/websocket/cacert.pem
%python_expand %fdupes %{buildroot}/%{$python_sitelib}
%if %{with test}

35
use_system_cabundle.patch Normal file
View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15f585566e2ea7459136a632b9785aa081093064391878a448c382415e948d72
size 194701

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:933f6bbf08b381f2adbca9e93d7e7958ba212b42c73acb310b18f0fbe74f3738
size 203950