diff --git a/.gitignore b/.gitignore index c6b8cf0..dfa11e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/websocket-client-1.2.3.tar.gz +SOURCES/websocket_client-1.8.0.tar.gz diff --git a/.python-websocket-client.metadata b/.python-websocket-client.metadata index 0ae7698..5433564 100644 --- a/.python-websocket-client.metadata +++ b/.python-websocket-client.metadata @@ -1 +1 @@ -c40b41a73a5aa7c08d28e8d6abd31eff831c295e SOURCES/websocket-client-1.2.3.tar.gz +9448fe6cbf868c5b01ae9c45fa8a62554af89f19 SOURCES/websocket_client-1.8.0.tar.gz diff --git a/SOURCES/0001-Include-pytest-in-test-extra.patch b/SOURCES/0001-Include-pytest-in-test-extra.patch new file mode 100644 index 0000000..46a9552 --- /dev/null +++ b/SOURCES/0001-Include-pytest-in-test-extra.patch @@ -0,0 +1,28 @@ +From dd3e11fbaa0705e52ac58088f543403521dfe58c Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Fri, 30 Aug 2024 14:32:00 -0500 +Subject: [PATCH] Include pytest in test extra + +Fedora uses the test extra to automatically generate build-time +dependencies, so including pytest in this extra allows removal of an +explicit BuildRequires in the RPM spec file. +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8781948..f6a31f6 100644 +--- a/setup.py ++++ b/setup.py +@@ -39,7 +39,7 @@ + download_url="https://github.com/websocket-client/websocket-client/releases", + python_requires=">=3.8", + extras_require={ +- "test": ["websockets"], ++ "test": ["pytest", "websockets"], + "optional": ["python-socks", "wsaccel"], + "docs": ["Sphinx >= 6.0", "sphinx_rtd_theme >= 1.1.0", "myst-parser >= 2.0.0"], + }, +-- +2.46.0 + diff --git a/SPECS/python-websocket-client.spec b/SPECS/python-websocket-client.spec index 10dbf77..f82f1ee 100644 --- a/SPECS/python-websocket-client.spec +++ b/SPECS/python-websocket-client.spec @@ -1,8 +1,3 @@ -# what it's called on pypi -%global srcname websocket-client -# what it's imported as -%global libname websocket - %global common_description %{expand: websocket-client is a WebSocket client for Python. It provides access to low level APIs for WebSockets. websocket-client implements version hybi-13 of the @@ -10,34 +5,32 @@ WebSocket protocol. This client does not currently support the permessage-deflate extension from RFC 7692.} -Name: python-%{srcname} -Version: 1.2.3 +Name: python-websocket-client +Version: 1.8.0 Release: 2%{?dist} Summary: WebSocket client for python -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/websocket-client/websocket-client -Source0: %pypi_source BuildArch: noarch +Source: %{pypi_source websocket_client} + +# https://github.com/websocket-client/websocket-client/pull/998 +Patch: 0001-Include-pytest-in-test-extra.patch %description %{common_description} -%package -n python3-%{srcname} +%package -n python3-websocket-client Summary: %{summary} BuildRequires: python3-devel -BuildRequires: %{py3_dist pytest} - -# https://fedoraproject.org/wiki/Packaging:Conflicts#Splitting_Packages -# wsdump moved from py2 to py3 package -Conflicts: python2-websocket-client <= 0.40.0-4 -%description -n python3-%{srcname} %{common_description} +%description -n python3-websocket-client %{common_description} %prep -%autosetup -n %{srcname}-%{version} +%autosetup -p 1 -n websocket_client-%{version} %generate_buildrequires @@ -50,22 +43,69 @@ Conflicts: python2-websocket-client <= 0.40.0-4 %install %pyproject_install -%pyproject_save_files %{libname} +%pyproject_save_files -l websocket %check -%pytest websocket/tests +%pytest -v websocket/tests -%files -n python3-%{srcname} -f %{pyproject_files} -%license LICENSE +%files -n python3-websocket-client -f %{pyproject_files} %doc README.md ChangeLog %{_bindir}/wsdump %changelog -* Sun Jul 28 2024 Sergey Cherevko - 1.2.3-2 -- Rebuilt for MSVSphere 9.4 +* Sun Jan 05 2025 Arkady L. Shane - 1.8.0-2 +- Rebuilt for MSVSphere 10 + +* Fri Aug 30 2024 Carl George - 1.8.0-2 +- Remove explicit pytest buildreq by including it in the test extra +- Remove duplicate license file + +* Fri Aug 30 2024 Michel Lind - 1.8.0-1 +- Update to 1.8.0 +- Don't use macros for names +- Resolves: rhbz#2276771 + +* Wed Jul 24 2024 Miroslav Suchý - 1.7.0-4 +- convert license to SPDX + +* Fri Jul 19 2024 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.7.0-2 +- Rebuilt for Python 3.13 + +* Mon Apr 15 2024 Lumír Balhar - 1.7.0-1 +- Update to 1.7.0 (rhbz#2121193) + +* Fri Jan 26 2024 Fedora Release Engineering - 1.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 1.3.3-4 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 30 2022 Major Hayden - 1.3.3-1 +- Update to 1.3.3 + +* Thu Jun 16 2022 Python Maint - 1.3.2-2 +- Rebuilt for Python 3.11 + +* Wed Apr 06 2022 Major Hayden - 1.3.2-1 +- Update to 1.3.2 * Fri Jan 21 2022 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild