From c07474c40ab39c4d8a1d7bf019ccb3d6438a8a3f Mon Sep 17 00:00:00 2001
From: rdobuilder <dev@lists.rdoproject.org>
Date: Sep 02 2024 07:21:09 +0000
Subject: Update to 1.8.0


Related-to: https://review.rdoproject.org/r/q/I25a7b8fa3cfb96d418d65dc210755039116fc43b

---

diff --git a/.python-websocket-client.metadata b/.python-websocket-client.metadata
index 889b67c..5433564 100644
--- a/.python-websocket-client.metadata
+++ b/.python-websocket-client.metadata
@@ -1 +1 @@
-51025275351e8cf24c133b524650ddf8faac5744  SOURCES/websocket-client-1.7.0.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 <carlwgeorge@gmail.com>
+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 4775438..2311c8f 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,35 +5,33 @@ WebSocket protocol.  This client does not currently support the
 permessage-deflate extension from RFC 7692.}
 
 
-Name:               python-%{srcname}
-Version:            1.7.0
-Release:            1%{?dist}
+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:  pyproject-rpm-macros
-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
@@ -51,20 +44,37 @@ 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
+* Fri Aug 30 2024 Carl George <carlwgeorge@fedoraproject.org> - 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 <salimma@fedoraproject.org> - 1.8.0-1
+- Update to 1.8.0
+- Don't use macros for names
+- Resolves: rhbz#2276771
+
+* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 1.7.0-4
+- convert license to SPDX
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 1.7.0-2
+- Rebuilt for Python 3.13
+
 * Mon Apr 15 2024 Lumír Balhar <lbalhar@redhat.com> - 1.7.0-1
 - Update to 1.7.0 (rhbz#2121193)