From b73305c9996924b082efd4ed64f32bec28cbe94c6511c2596b40a403d825ddc5 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 5 Jul 2017 12:01:29 +0000 Subject: [PATCH 1/6] Accepting request 508234 from home:tbechtold:branches:devel:languages:python - update to 0.44.0: -renames key in sslopt dict (#326) - Unkown kwarg 'ca_cert' when calling ssl wrap_socket() (#326) - Race condition in WebSocket ping/pong (#327) - Implement simple cookie jar(#292) - fix: when using pppoe redial will block.(#301) - Fix insecure_pythons list in setup.py(#304) - Support WEBSOCKET_CLIENT_CA_BUNDLE being directory(#307) - WebSocketPayloadException under high traffic and limited network connection(#306) - Not working --nocert parameter in wsdump.py(#315) - Avoid the app to block on close on certain systems (#320) - Fix warning is not defined. (#323) - move to repository to https://github.com/websocket-client/websocket-client.git - _send_ping warning fails due to missing reference in _logging.__all__ (#294) - Fix opcode -> op_code (#286) - Shuffled around example code (#256) - _send_ping graceful error handling (#262) - Allow closing WebSocketApp with status/reason/timeout (#265) - Support universal wheels (#267) - _url: Added subnet IP address matching in no_proxy host detection (#270) - fixed Incorrect encoding in continued messages python3 (#261) - Pass headers for websocket handshake (#271) - setup.py: Import `logging` before calling it. (#272) - Implemented close code 1014 (#273) - Support CA bundle specified by environment variable (#279) - Response header values should not be converted to lower case (#264) - Exclude port 443 from host http header (#248) - Cleanup code (#249) - Modify a code block directive in README (#250) - fixed ping/pong timeouet (#253) OBS-URL: https://build.opensuse.org/request/show/508234 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=18 --- python-websocket-client.changes | 36 ++++++++++++++++++ python-websocket-client.spec | 66 +++++++++++---------------------- websocket_client-0.37.0.tar.gz | 3 -- websocket_client-0.44.0.tar.gz | 3 ++ 4 files changed, 61 insertions(+), 47 deletions(-) delete mode 100644 websocket_client-0.37.0.tar.gz create mode 100644 websocket_client-0.44.0.tar.gz diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 09ed757..12302c7 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Jul 5 05:10:45 UTC 2017 - tbechtold@suse.com + +- update to 0.44.0: + -renames key in sslopt dict (#326) + - Unkown kwarg 'ca_cert' when calling ssl wrap_socket() (#326) + - Race condition in WebSocket ping/pong (#327) + - Implement simple cookie jar(#292) + - fix: when using pppoe redial will block.(#301) + - Fix insecure_pythons list in setup.py(#304) + - Support WEBSOCKET_CLIENT_CA_BUNDLE being directory(#307) + - WebSocketPayloadException under high traffic and limited network connection(#306) + - Not working --nocert parameter in wsdump.py(#315) + - Avoid the app to block on close on certain systems (#320) + - Fix warning is not defined. (#323) + - move to repository to https://github.com/websocket-client/websocket-client.git + - _send_ping warning fails due to missing reference in _logging.__all__ (#294) + - Fix opcode -> op_code (#286) + - Shuffled around example code (#256) + - _send_ping graceful error handling (#262) + - Allow closing WebSocketApp with status/reason/timeout (#265) + - Support universal wheels (#267) + - _url: Added subnet IP address matching in no_proxy host detection (#270) + - fixed Incorrect encoding in continued messages python3 (#261) + - Pass headers for websocket handshake (#271) + - setup.py: Import `logging` before calling it. (#272) + - Implemented close code 1014 (#273) + - Support CA bundle specified by environment variable (#279) + - Response header values should not be converted to lower case (#264) + - Exclude port 443 from host http header (#248) + - Cleanup code (#249) + - Modify a code block directive in README (#250) + - fixed ping/pong timeouet (#253) +- convert to singlespec +- merge -test package + ------------------------------------------------------------------- Tue Nov 15 13:11:34 UTC 2016 - dmueller@suse.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 01d71fd..4d2744f 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -1,7 +1,7 @@ # # spec file for package python-websocket-client # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -24,29 +24,30 @@ %endif Name: python-websocket-client -Version: 0.37.0 +Version: 0.44.0 Release: 0 Summary: WebSocket client implementation License: LGPL-2.1 Group: Development/Languages/Python Url: https://github.com/liris/websocket-client/releases -Source0: https://pypi.io/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz +Source0: https://file.pythonhosted.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz BuildRequires: %backports -BuildRequires: python-setuptools -BuildRequires: python-six -Requires: %backports +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: python-rpm-macros Requires: python Requires: python-six Requires(post): update-alternatives Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: python-argparse -BuildRequires: python-unittest2 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch +%ifpython2 +Requires: %backports +Provides: python-websocket-client-test = %{version} +Obsoletes: python-websocket-client-test < %{version} %endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%python_subpackages %description websocket-client module is WebSocket client for python. This provide the @@ -54,57 +55,34 @@ low level APIs for WebSocket. All APIs are the synchronous functions. websocket-client supports only hybi-13. -%package test -Summary: Unit tests -Group: Development/Languages/Python -Requires: python-websocket-client = %{version} - -%description test -Unit tests for websocket-client - %prep %setup -q -n websocket_client-%{version} %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_clone -a %{buildroot}%{_bindir}/wsdump.py # Use the system certs rm %{buildroot}/%{python_sitelib}/websocket/cacert.pem -# update alternatives -mv %{buildroot}%{_bindir}/wsdump.py %{buildroot}%{_bindir}/wsdump.py-%{py_ver} -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/wsdump.py -ln -sf %{_sysconfdir}/alternatives/wsdump.py %{buildroot}/%{_bindir}/wsdump.py %check -python websocket/tests/test_websocket.py +%python_exec websocket/tests/test_websocket.py %post -update-alternatives \ - --install %{_bindir}/wsdump.py wsdump.py %{_bindir}/wsdump.py-%{py_ver} 20 +%python_install_alternative wsdump.py %postun -if [ $1 -eq 0 ] ; then - update-alternatives --remove wsdump.py %{_bindir}/wsdump.py-%{py_ver} -fi +%python_uninstall_alternative wsdump.py -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE README.rst %dir %{python_sitelib}/websocket %dir %{python_sitelib}/websocket_client-%{version}-py*.egg-info -%{_bindir}/wsdump.py -%{_bindir}/wsdump.py-%{py_ver} -%exclude %{python_sitelib}/websocket/tests/ +%python_alternative %{_bindir}/wsdump.py %{python_sitelib}/websocket/* %{python_sitelib}/*egg-info/* -%ghost %{_sysconfdir}/alternatives/wsdump.py - -%files test -%defattr(-,root,root,-) -%dir %{python_sitelib}/websocket/tests -%{python_sitelib}/websocket/tests/* %changelog diff --git a/websocket_client-0.37.0.tar.gz b/websocket_client-0.37.0.tar.gz deleted file mode 100644 index dba28ca..0000000 --- a/websocket_client-0.37.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:678b246d816b94018af5297e72915160e2feb042e0cde1a9397f502ac3a52f41 -size 194246 diff --git a/websocket_client-0.44.0.tar.gz b/websocket_client-0.44.0.tar.gz new file mode 100644 index 0000000..14c3fef --- /dev/null +++ b/websocket_client-0.44.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f585566e2ea7459136a632b9785aa081093064391878a448c382415e948d72 +size 194701 From 9e3a4ea422af6bff9ab552f93b5bd417d64c71135d3a8022369115f7337a022f Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 24 Jul 2017 12:22:33 +0000 Subject: [PATCH 2/6] Accepting request 511933 from home:TheBlackCat:branches:devel:languages:python - Fix singlespec macro usage - Fix source URL. OBS-URL: https://build.opensuse.org/request/show/511933 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=19 --- python-websocket-client.changes | 6 ++++++ python-websocket-client.spec | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 12302c7..66aa3a2 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 21 17:46:23 UTC 2017 - toddrme2178@gmail.com + +- Fix singlespec macro usage +- Fix source URL. + ------------------------------------------------------------------- Wed Jul 5 05:10:45 UTC 2017 - tbechtold@suse.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 4d2744f..50d57c7 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -18,11 +18,13 @@ # RHEL provides this backport in its own repository %if 0%{?rhel} == 7 -%define backports python-backports-ssl_match_hostname +%define ssl_match_hostname python-backports-ssl_match_hostname %else -%define backports python-backports.ssl_match_hostname +%define ssl_match_hostname python-backports.ssl_match_hostname %endif +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-websocket-client Version: 0.44.0 Release: 0 @@ -30,8 +32,8 @@ Summary: WebSocket client implementation License: LGPL-2.1 Group: Development/Languages/Python Url: https://github.com/liris/websocket-client/releases -Source0: https://file.pythonhosted.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz -BuildRequires: %backports +Source0: https://files.pythonhosted.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz +BuildRequires: %ssl_match_hostname BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: python-rpm-macros @@ -40,20 +42,19 @@ Requires: python-six Requires(post): update-alternatives Requires(postun): update-alternatives %ifpython2 -Requires: %backports -Provides: python-websocket-client-test = %{version} -Obsoletes: python-websocket-client-test < %{version} +Requires: %ssl_match_hostname +Provides: %{oldpython}-websocket-client-test = %{version} +Obsoletes: %{oldpython}-websocket-client-test < %{version} %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages %description -websocket-client module is WebSocket client for python. This provide the +The websocket-client module is WebSocket client for python. This provide the low level APIs for WebSocket. All APIs are the synchronous functions. -websocket-client supports only hybi-13. +Websocket-client supports only hybi-13. %prep %setup -q -n websocket_client-%{version} @@ -64,6 +65,7 @@ websocket-client supports only hybi-13. %install %python_install %python_clone -a %{buildroot}%{_bindir}/wsdump.py + # Use the system certs rm %{buildroot}/%{python_sitelib}/websocket/cacert.pem @@ -79,10 +81,8 @@ rm %{buildroot}/%{python_sitelib}/websocket/cacert.pem %files %{python_files} %defattr(-,root,root,-) %doc LICENSE README.rst -%dir %{python_sitelib}/websocket -%dir %{python_sitelib}/websocket_client-%{version}-py*.egg-info %python_alternative %{_bindir}/wsdump.py -%{python_sitelib}/websocket/* -%{python_sitelib}/*egg-info/* +%{python_sitelib}/websocket/ +%{python_sitelib}/websocket_client-%{version}-py*.egg-info %changelog From a470bc579becd7a4f969a25f25baa0848f4647a389004ff1c827bc163ab70614 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 25 Jul 2017 11:35:26 +0000 Subject: [PATCH 3/6] Accepting request 512393 from home:jengelh:branches:devel:languages:python - Grammatical/Typographic corrections to the description. OBS-URL: https://build.opensuse.org/request/show/512393 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=20 --- python-websocket-client.changes | 5 +++++ python-websocket-client.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 66aa3a2..25e5853 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 24 23:55:01 UTC 2017 - jengelh@inai.de + +- Grammatical/Typographic corrections to the description. + ------------------------------------------------------------------- Fri Jul 21 17:46:23 UTC 2017 - toddrme2178@gmail.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 50d57c7..bbedd01 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -51,8 +51,8 @@ BuildArch: noarch %python_subpackages %description -The websocket-client module is WebSocket client for python. This provide the -low level APIs for WebSocket. All APIs are the synchronous functions. +The websocket-client module is a WebSocket client for Python. This provides the +low-level APIs for WebSocket. All APIs are synchronous functions. Websocket-client supports only hybi-13. From 1407a066130fbe0d63b3b2e8b81abba730adfea7788fabe90e4ccb61b26f5084 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 23 Aug 2017 16:21:44 +0000 Subject: [PATCH 4/6] Accepting request 517021 from home:TheBlackCat:branches:devel:languages:python - Update license to LGPL 3 - Fix rpmlint issues OBS-URL: https://build.opensuse.org/request/show/517021 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=21 --- python-websocket-client.changes | 6 ++++++ python-websocket-client.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 25e5853..b3d6e0c 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 15 15:10:45 UTC 2017 - toddrme2178@gmail.com + +- Update license to LGPL 3 +- Fix rpmlint issues + ------------------------------------------------------------------- Mon Jul 24 23:55:01 UTC 2017 - jengelh@inai.de diff --git a/python-websocket-client.spec b/python-websocket-client.spec index bbedd01..f32b8c5 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -25,19 +25,20 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python +%bcond_without test Name: python-websocket-client Version: 0.44.0 Release: 0 Summary: WebSocket client implementation -License: LGPL-2.1 +License: LGPL-3.0 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 BuildRequires: %ssl_match_hostname BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python Requires: python-six Requires(post): update-alternatives Requires(postun): update-alternatives @@ -67,10 +68,14 @@ Websocket-client supports only hybi-13. %python_clone -a %{buildroot}%{_bindir}/wsdump.py # Use the system certs -rm %{buildroot}/%{python_sitelib}/websocket/cacert.pem +%python_expand rm %{buildroot}/%{$python_sitelib}/websocket/cacert.pem +%python_expand %fdupes %{buildroot}/%{$python_sitelib} + +%if %{with test} %check %python_exec websocket/tests/test_websocket.py +%endif %post %python_install_alternative wsdump.py From d1dc559d10b47148d4c6925ca9ede00613f73a973c5471534b32803f2892c693 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 29 Aug 2017 12:59:32 +0000 Subject: [PATCH 5/6] Accepting request 519179 from home:tbechtold:branches:devel:languages:python - Fix build for Leap 42.3 OBS-URL: https://build.opensuse.org/request/show/519179 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=22 --- python-websocket-client.changes | 5 +++++ python-websocket-client.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index b3d6e0c..15ea292 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 28 16:25:44 UTC 2017 - tbechtold@suse.com + +- Fix build for Leap 42.3 + ------------------------------------------------------------------- Tue Aug 15 15:10:45 UTC 2017 - toddrme2178@gmail.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index f32b8c5..b848ef6 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -35,6 +35,7 @@ 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 BuildRequires: %ssl_match_hostname +BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes From bb26e3becf010cecb6ee5f1584cb1bebde71f2221fbf1d222dc8f326e0c2d1f6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 5 Sep 2017 07:57:49 +0000 Subject: [PATCH 6/6] - properly provide/obsolete python3-websocket-client-test OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=23 --- python-websocket-client.changes | 5 +++++ python-websocket-client.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index 15ea292..e8401ce 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 5 07:57:36 UTC 2017 - dmueller@suse.com + +- properly provide/obsolete python3-websocket-client-test + ------------------------------------------------------------------- Mon Aug 28 16:25:44 UTC 2017 - tbechtold@suse.com diff --git a/python-websocket-client.spec b/python-websocket-client.spec index b848ef6..d3abecb 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -24,7 +24,6 @@ %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python %bcond_without test Name: python-websocket-client Version: 0.44.0 @@ -45,9 +44,9 @@ Requires(post): update-alternatives Requires(postun): update-alternatives %ifpython2 Requires: %ssl_match_hostname -Provides: %{oldpython}-websocket-client-test = %{version} -Obsoletes: %{oldpython}-websocket-client-test < %{version} %endif +Provides: python-websocket-client-test = %{version} +Obsoletes: python-websocket-client-test < %{version} BuildArch: noarch %python_subpackages