Accepting request 1306187 from Archiving

- Switch from %python_{build,install} to %pyproject_* macros. (forwarded request 1305262 from mcepl)

OBS-URL: https://build.opensuse.org/request/show/1306187
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-zstandard?expand=0&rev=20

feature-detection.patch

@@ -1,8 +1,14 @@
-diff --git a/c-ext/backend_c.c b/c-ext/backend_c.c
-index 9aa7a5c..f67191a 100644
---- a/c-ext/backend_c.c
-+++ b/c-ext/backend_c.c
-@@ -210,6 +210,20 @@ void zstd_module_init(PyObject *m) {
+---
+ c-ext/backend_c.c               |   14 ++++++++++++++
+ setup_zstd.py                   |    1 +
+ tests/test_module_attributes.py |   10 +++++++++-
+ 3 files changed, 24 insertions(+), 1 deletion(-)
+
+Index: zstandard-0.24.0/c-ext/backend_c.c
+===================================================================
+--- zstandard-0.24.0.orig/c-ext/backend_c.c	2025-08-17 01:50:50.000000000 +0200
++++ zstandard-0.24.0/c-ext/backend_c.c	2025-09-16 16:15:10.125710215 +0200
+@@ -210,6 +210,20 @@
      Py_DECREF(feature);
  #endif
  
@@ -23,11 +29,11 @@ index 9aa7a5c..f67191a 100644
      if (PyObject_SetAttrString(m, "backend_features", features) == -1) {
          return;
      }
-diff --git a/setup_zstd.py b/setup_zstd.py
-index 5aefdd0..3d8fe73 100644
---- a/setup_zstd.py
-+++ b/setup_zstd.py
-@@ -78,6 +78,7 @@ def get_c_extension(
+Index: zstandard-0.24.0/setup_zstd.py
+===================================================================
+--- zstandard-0.24.0.orig/setup_zstd.py	2025-08-17 02:20:18.000000000 +0200
++++ zstandard-0.24.0/setup_zstd.py	2025-09-16 16:15:10.125758965 +0200
+@@ -79,6 +79,7 @@
  
      if system_zstd:
          extra_args.append("-DZSTD_MULTITHREAD")
@@ -35,11 +41,11 @@ index 5aefdd0..3d8fe73 100644
      else:
          extra_args.append("-DZSTD_SINGLE_FILE")
          extra_args.append("-DZSTDLIB_VISIBLE=")
-diff --git a/tests/test_module_attributes.py b/tests/test_module_attributes.py
-index a540bfe..a081b1a 100644
---- a/tests/test_module_attributes.py
-+++ b/tests/test_module_attributes.py
-@@ -26,7 +26,15 @@ class TestModuleAttributes(unittest.TestCase):
+Index: zstandard-0.24.0/tests/test_module_attributes.py
+===================================================================
+--- zstandard-0.24.0.orig/tests/test_module_attributes.py	2025-08-17 19:03:17.000000000 +0200
++++ zstandard-0.24.0/tests/test_module_attributes.py	2025-09-16 16:15:10.125970238 +0200
+@@ -26,7 +26,15 @@
              },
          }[zstd.backend]
  

fix-zstd-1.5.6.patch

@@ -1,34 +0,0 @@
-https://github.com/indygreg/python-zstandard/pull/221
-
-commit e362dd47a0a339cd95a663ca4e54e628060ce6f1
-Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
-Date:   Fri Apr 5 08:55:10 2024 +0200
-
-    Support zstd-1.5.6
-
-diff --git a/c-ext/backend_c.c b/c-ext/backend_c.c
-index bf61f9c..aabe30b 100644
---- a/c-ext/backend_c.c
-+++ b/c-ext/backend_c.c
-@@ -152,7 +152,7 @@ void zstd_module_init(PyObject *m) {
-     PyObject *features = NULL;
-     PyObject *feature = NULL;
-     unsigned zstd_ver_no = ZSTD_versionNumber();
--    unsigned our_hardcoded_version = 10505;
-+    unsigned our_hardcoded_version = 10506;
-     if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
-         zstd_ver_no != our_hardcoded_version) {
-         PyErr_Format(
-diff --git a/tests/test_module_attributes.py b/tests/test_module_attributes.py
-index 145f7be..1f37b82 100644
---- a/tests/test_module_attributes.py
-+++ b/tests/test_module_attributes.py
-@@ -5,7 +5,7 @@ import zstandard as zstd
- 
- class TestModuleAttributes(unittest.TestCase):
-     def test_version(self):
--        self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 5))
-+        self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 6))
- 
-         self.assertEqual(zstd.__version__, "0.22.0")
- 

python-zstandard.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Tue Sep 16 14:22:03 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Switch from %python_{build,install} to %pyproject_* macros.
+
+-------------------------------------------------------------------
+Mon Sep  8 05:29:20 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Update to 0.24.0
+  * Support for Python 3.8 has been dropped
+  * Bundled zstd library upgraded from 1.5.6 to 1.5.7.
+  * We now use and require cffi 1.17.0 or newer.
+  * We now collections.abs.Buffer on Python 3.12+ instead of typing.ByteString,
+    as typing.ByteString was deprecated and later removed.
+  * get_frame_parameters() now accepts an optional format argument defining
+    the zstandard frame type.
+  * Initial Python 3.14 support.
+- Drop merged fix-zstd-1.5.7.patch
+
+-------------------------------------------------------------------
+Tue Jul 22 07:55:15 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Update to 0.23.0
+  * tests: suppress data_too_large health check
+  * zstd: upgrade vendored zstd to 1.5.6
+  * setup: Python 3.13 support
+  * rust: upgrade packages in Cargo.toml
+  * build: fix building with modern setuptools backend
+
+-------------------------------------------------------------------
+Fri Feb 21 10:44:16 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add fix-zstd-1.5.7.patch to make it work with zstd-1.5.7
+- Drop fix-zstd-1.5.6.patch
+- Require libzstd1 = 1.5.7
+
+-------------------------------------------------------------------
+Tue Aug  6 03:43:14 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Remove Conflict with python-zstd - they should be co-installable
+
 -------------------------------------------------------------------
 Fri Apr  5 06:57:08 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
 

python-zstandard.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-zstandard
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-zstandard
-Version:        0.22.0
+Version:        0.24.0
 Release:        0
 Summary:        Zstandard bindings for Python
 License:        BSD-3-Clause
@@ -26,18 +26,17 @@ Group:          Development/Languages/Python
 URL:            https://github.com/indygreg/python-zstandard
 Source:         https://files.pythonhosted.org/packages/source/z/zstandard/zstandard-%{version}.tar.gz
 Patch0:         feature-detection.patch
-Patch1:         fix-zstd-1.5.6.patch
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
-BuildRequires:  libzstd-devel
+BuildRequires:  libzstd-devel = 1.5.7
 BuildRequires:  python-rpm-macros
-BuildRequires:  zstd = 1.5.6
-Requires:       python-cffi >= 1.11
-Requires:       zstd
-Conflicts:      python-zstd
+Requires:       libzstd1 = 1.5.7
+Requires:       python-cffi >= 1.17
 # SECTION test requirements
-BuildRequires:  %{python_module cffi >= 1.11}
+BuildRequires:  %{python_module cffi >= 1.17}
 BuildRequires:  %{python_module exceptiongroup}
 BuildRequires:  %{python_module hypothesis}
 BuildRequires:  %{python_module pytest-xdist}
@@ -53,10 +52,11 @@ Zstandard bindings for Python
 
 %build
 export CFLAGS="%{optflags}"
-%python_build --system-zstd
+%define py_setup_args "--system-zstd"
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check

zstandard-0.24.0.tar.gz

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