pool/python-zstandard
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add fix-zstd-1.5.7.patch to make it work with zstd-1.5.7

Browse Source 
- Drop fix-zstd-1.5.6.patch

OBS-URL: https://build.opensuse.org/package/show/Archiving/python-zstandard?expand=0&rev=16
This commit is contained in:
Bernhard M. Wiedemann 2025-02-21 10:45:09 +00:00 committed by Git OBS Bridge
commit 9748ece0f8
8 changed files with 518 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

58
feature-detection.patch Normal file
View File

@ -0,0 +1,58 @@
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) {
Py_DECREF(feature);
#endif
+#ifdef SYSTEM_ZSTD
+ feature = PyUnicode_FromString("system_zstd");
+ if (NULL == feature) {
+ PyErr_SetString(PyExc_ImportError, "could not create feature string");
+ return;
+ }
+
+ if (PySet_Add(features, feature) == -1) {
+ return;
+ }
+
+ Py_DECREF(feature);
+#endif
+
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(
if system_zstd:
extra_args.append("-DZSTD_MULTITHREAD")
+ extra_args.append("-DSYSTEM_ZSTD")
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):
},
}[zstd.backend]
- self.assertEqual(zstd.backend_features, expected)
+ # The following features are available only with
+ # statically linked version of the module.
+ available_features = set(zstd.backend_features)
+ if 'system_zstd' in available_features:
+ available_features.remove('system_zstd')
+ expected.discard('multi_compress_to_buffer')
+ expected.discard('multi_decompress_to_buffer')
+
+ self.assertEqual(available_features, expected)
def test_constants(self):
self.assertEqual(zstd.MAX_COMPRESSION_LEVEL, 22)

34
fix-zstd-1.5.6.patch Normal file
View File

@ -0,0 +1,34 @@
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")

79
fix-zstd-1.5.7.patch Normal file
View File

@ -0,0 +1,79 @@
Index: zstandard-0.22.0/tests/test_compressor_compress.py
===================================================================
--- zstandard-0.22.0.orig/tests/test_compressor_compress.py
+++ zstandard-0.22.0/tests/test_compressor_compress.py
@@ -52,7 +52,7 @@ class TestCompressor_compress(unittest.T
cctx = zstd.ZstdCompressor(level=3, write_content_size=False)
result = cctx.compress(b"".join(chunks))
- self.assertEqual(len(result), 999)
+ self.assertEqual(len(result), 1029)
self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd")
# This matches the test for read_to_iter() below.
Index: zstandard-0.22.0/tests/test_compressor_compressobj.py
===================================================================
--- zstandard-0.22.0.orig/tests/test_compressor_compressobj.py
+++ zstandard-0.22.0/tests/test_compressor_compressobj.py
@@ -39,7 +39,7 @@ class TestCompressor_compressobj(unittes
cobj = cctx.compressobj()
result = cobj.compress(b"".join(chunks)) + cobj.flush()
- self.assertEqual(len(result), 999)
+ self.assertEqual(len(result), 1029)
self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd")
params = zstd.get_frame_parameters(result)
Index: zstandard-0.22.0/tests/test_compressor_copy_stream.py
===================================================================
--- zstandard-0.22.0.orig/tests/test_compressor_copy_stream.py
+++ zstandard-0.22.0/tests/test_compressor_copy_stream.py
@@ -50,7 +50,7 @@ class TestCompressor_copy_stream(unittes
r, w = cctx.copy_stream(source, dest)
self.assertEqual(r, 255 * 16384)
- self.assertEqual(w, 999)
+ self.assertEqual(w, 1029)
params = zstd.get_frame_parameters(dest.getvalue())
self.assertEqual(params.content_size, zstd.CONTENTSIZE_UNKNOWN)
Index: zstandard-0.22.0/tests/test_compressor_stream_writer.py
===================================================================
--- zstandard-0.22.0.orig/tests/test_compressor_stream_writer.py
+++ zstandard-0.22.0/tests/test_compressor_stream_writer.py
@@ -301,7 +301,7 @@ class TestCompressor_stream_writer(unitt
d = zstd.train_dictionary(8192, samples)
h = hashlib.sha1(d.as_bytes()).hexdigest()
- self.assertEqual(h, "a46d2f7a3bc3357c9d717d3dadf9a26fde23e93d")
+ self.assertEqual(h, "f32ddfbe0878bbd428afc00b17810387c6752191")
buffer = io.BytesIO()
cctx = zstd.ZstdCompressor(level=9, dict_data=d)
Index: zstandard-0.22.0/c-ext/backend_c.c
===================================================================
--- zstandard-0.22.0.orig/c-ext/backend_c.c
+++ zstandard-0.22.0/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 = 10507;
if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
zstd_ver_no != our_hardcoded_version) {
PyErr_Format(
Index: zstandard-0.22.0/tests/test_module_attributes.py
===================================================================
--- zstandard-0.22.0.orig/tests/test_module_attributes.py
+++ zstandard-0.22.0/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, 7))
self.assertEqual(zstd.__version__, "0.22.0")

248
python-zstandard.changes Normal file
View File

@ -0,0 +1,248 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
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>
- Add fix-zstd-1.5.6.patch to work with zstd-1.5.6
-------------------------------------------------------------------
Tue Mar 5 13:37:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows us to eliminate usage of deprecated
%patchN.
-------------------------------------------------------------------
Thu Dec 28 15:34:05 UTC 2023 - ecsos <ecsos@opensuse.org>
- Add %{?sle15_python_module_pythons}
-------------------------------------------------------------------
Sat Nov 4 07:46:54 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.de>
- Update to version 0.22.0
* Official support for CPython 3.12
* ZstdDecompressor.decompressobj() now accepts a read_across_frames
boolean named argument to control whether to transparently read across
multiple zstd frames. It still defaults to False to preserve existing
behavior
-------------------------------------------------------------------
Wed Apr 19 15:19:47 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
- Update to version 0.21.0
* Support zstd 1.5.5
-------------------------------------------------------------------
Tue Feb 21 11:33:11 UTC 2023 - Martin Liška <mliska@suse.cz>
- Update to version 0.20.0
* This will likely be the last release officially supporting Python 3.6.
Python 3.6 is end of life as of 2021-12-23.
* Bundled zstd library upgraded from 1.5.2 to 1.5.4.
* Use of the deprecated ZSTD_copyDCtx() was removed from the C and
Rust backends.
-------------------------------------------------------------------
Fri Feb 17 12:46:17 UTC 2023 - Martin Liška <mliska@suse.cz>
- Enable --system-zstd so that we depend of a system shared library
of zstd.
- Add feature-detection.patch as feature detection test does not support
--system-zstd (gh#indygreg/python-zstandard#191).
-------------------------------------------------------------------
Mon Dec 5 18:21:01 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
- Fixed spec file to include exceptiongroup
-------------------------------------------------------------------
Sun Nov 20 04:47:59 UTC 2022 - Mia Herkt <mia@0x0.st>
- Update to 0.19.0
Bug fixes
* The C backend implementation of
ZstdDecompressionObj.decompress() could have raised an
assertion in cases where the function was called multiple times
on an instance. In non-debug builds, calls to this method could
have leaked memory.
Changes
* PyPy 3.6 support dropped; Pypy 3.8 and 3.9 support added.
* Anaconda 3.6 support dropped.
* Official support for Python 3.11. This did not require
meaningful code changes and previous release(s) likely worked
with 3.11 without any changes. CFFI's build system now respects
distutils's compiler.preprocessor if it is set.
gh#indygreg/python-zstandard#179
* The internal logic of ZstdDecompressionObj.decompress() was
refactored. This may have fixed unconfirmed issues where
unused_data was set prematurely. The new logic will also avoid
an extra call to ZSTD_decompressStream() in some scenarios,
possibly improving performance.
* ZstdDecompressor.decompress() how has a read_across_frames
keyword argument. It defaults to False. True is not yet
implemented and will raise an exception if used. The new
argument will default to True in a future release and is
provided now so callers can start passing
read_across_frames=False to preserve the existing functionality
during a future upgrade.
* ZstdDecompressor.decompress() now has an allow_extra_data
keyword argument to control whether an exception is raised if
input contains extra data. It defaults to True, preserving
existing behavior of ignoring extra data. It will likely
default to False in a future release. Callers desiring the
current behavior are encouraged to explicitly pass
allow_extra_data=True so behavior won't change during a future
upgrade.
- No changelog for 0.18.0 available
-------------------------------------------------------------------
Tue Feb 1 22:44:25 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Correctly test the installed solib
- Skip python2 on SLE/Leap: no longer supported
-------------------------------------------------------------------
Sun Jan 30 21:20:18 UTC 2022 - Sarah Kriesch <sarah.kriesch@opensuse.org>
- update to 0.17.0
* Python 3.9 wheels are now provided.
* Support for Python 3.5 has been dropped.
* Python 3.6 is now the minimum required Python version.
* Bundled zstandard library upgraded from 1.4.5 to 1.5.1.
* The bundled zstandard library is now using the single C source
file distribution. The 2 main header files are still present,
as these are needed by CFFI to generate the CFFI bindings.
* PyBuffer instances are no longer checked to be C contiguous and
have a single dimension. The former was redundant with what
PyArg_ParseTuple() already did and the latter is not necessary
in practice because very few extension modules create buffers
with more than 1 dimension. (#124)
* Added Python typing stub file for the zstandard module. (#120)
* The make_cffi.py script should now respect the CC environment
variable for locating the compiler. (#103)
* CI now properly uses the cffi backend when running all tests.
* train_dictionary() has been rewritten to use the fastcover APIs
and to consistently call ZDICT_optimizeTrainFromBuffer_fastCover()
instead of different C APIs depending on what arguments were passed.
The function also now accepts arguments f, split_point, and accel,
which are parameters unique to fastcover.
* CI now tests and builds wheels for Python 3.9.
* zstd.c file renamed to c-ext/backend_c.c.
* All built/installed Python modules are now in the zstandard package.
Previously, there were modules in other packages. (#115)
* C source code is now automatically formatted with clang-format.
* ZstdCompressor.stream_writer(), ZstdCompressor.stream_reader(),
ZstdDecompressor.stream_writer(), and ZstdDecompressor.stream_reader()
now accept a closed argument to control whether the underlying stream
should be closed when the ZstdCompressionWriter, ZstdCompressReader,
ZstdDecompressionWriter, or ZstdDecompressionReader is closed. (#76)
* There is now a zstandard.open() function for returning a file object
with zstd (de)compression. (#64)
* The zstandard module now exposes a backend_features attribute
containing a set of strings denoting optional features present in that
backend. This can be used to sniff feature support by performing a
string lookup instead of sniffing for API presence or behavior.
* Python docstrings have been moved from the C backend to the CFFI backend.
Sphinx docs have been updated to generate API documentation via the CFFI
backend. Documentation for Python APIs is now fully defined via Python
docstrings instead of spread across Sphinx ReST files and source code.
* ZstdCompressionParameters now exposes a strategy property.
* There are now compress() and decompress() convenience functions on the
zstandard module. These are simply wrappers around the corresponding APIs
on ZstdCompressor and ZstdDecompressor.
* The deprecated CompressionParameters type alias to ZstdCompressionParamaters
has been removed. Use ZstdCompressionParameters.
* setup.py now recognizes a ZSTD_EXTRA_COMPILER_ARGS environment variable to
specify additional compiler arguments to use when compiling the C backend.
* PyPy build and test coverage has been added to CI.
* Added CI jobs for building against external zstd library.
* Wheels supporting macOS ARM/M1 devices are now being produced.
* References to Python 2 have been removed from the in-repo Debian packaging code.
* Significant work has been made on a Rust backend. It is currently feature
complete but not yet optimized. We are not yet shipping the backend as part
of the distributed wheels until it is more mature.
* ZstdCompressor.multi_compress_to_buffer() and ZstdDecompressor.multi_decompress_to_buffer()
are no longer available when linking against a system zstd library.
These experimental features are only available when building against the
bundled single file zstd C source file distribution. (#106)
* The .pyi type annotations file has replaced various default argument
values with ....
* manylinux2014_aarch64 wheels are now being produced for CPython 3.6+. (#145).
* Wheels are now being produced for CPython 3.10.
* Arguments to ZstdCompressor() and ZstdDecompressor() are now all optional in
the C backend and an explicit None value is accepted. Before, the C backend
wouldn’t accept an explicit None value (but the CFFI backend would).
The new behavior should be consistent between the backends. (#153)
* The C backend now exposes the symbols ZstdCompressionReader, ZstdCompressionWriter,
ZstdDecompressionReader, and ZstdDecompressionWriter. This should match the behavior
of the CFFI backend. (#165)
* ZstdCompressionWriter and ZstdDecompressionWriter now
implement __iter__ and __next__, which always raise io.UnsupportedOperation.
* Documentation on thread safety has been updated to note that derived objects like
ZstdCompressionWriter have the same thread unsafety as the contexts they were
derived from. (#166)
* The HASHLOG3_MAX constant has been removed since it is no longer defined in zstd 1.5.1.
-------------------------------------------------------------------
Tue Jul 21 08:39:31 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
- update to 0.14.0
* This will likely be the final version supporting Python 2.7. Future
releases will likely only work on Python 3.5+. See #109 for more
context.
* There is a significant possibility that future versions will use
Rust - instead of C - for compiled code. See #110 for more context.
* Some internal fields of C structs are now explicitly initialized.
(Possible fix for #105.)
* The ``make_cffi.py`` script used to build the CFFI bindings now
calls ``distutils.sysconfig.customize_compiler()`` so compiler
customizations (such as honoring the ``CC`` environment variable)
are performed. Patch by @Arfrever. (#103)
* The ``make_cffi.py`` script now sets ``LC_ALL=C`` when invoking
the preprocessor in an attempt to normalize output to ASCII. (#95)
-------------------------------------------------------------------
Mon Mar 9 10:11:02 UTC 2020 - pgajdos@suse.com
- version update to 0.13.0
* ``pytest-xdist`` ``pytest`` extension is now installed so tests can be
run in parallel.
* CI now builds ``manylinux2010`` and ``manylinux2014`` binary wheels
instead of a mix of ``manylinux2010`` and ``manylinux1``.
* Official support for Python 3.8 has been added.
* Bundled zstandard library upgraded from 1.4.3 to 1.4.4.
* Python code has been reformatted with black.
-------------------------------------------------------------------
Fri Sep 20 12:09:10 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 0.12.0:
* Fix ZstdDecompressor.__init__ on 64-bit big-endian systems (#91).
* Fix memory leak in ZstdDecompressionReader.seek() (#82).
* CI transitioned to Azure Pipelines (from AppVeyor and Travis CI).
* Switched to pytest for running tests (from nose).
-------------------------------------------------------------------
Fri May 24 13:39:30 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 0.11.1:
* Fix memory leak in ``ZstdDecompressionReader.seek()`` (#82).
-------------------------------------------------------------------
Tue May 7 15:40:00 UTC 2019 - Todd R <toddrme2178@gmail.com>
- Conflict with python-zstd, which shares the same module name.
-------------------------------------------------------------------
Tue Apr 30 14:48:35 UTC 2019 - Todd R <toddrme2178@gmail.com>
- Initial version

72
python-zstandard.spec Normal file
View File

@ -0,0 +1,72 @@
#
# spec file for package python-zstandard
#
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?sle15_python_module_pythons}
Name: python-zstandard
Version: 0.22.0
Release: 0
Summary: Zstandard bindings for Python
License: BSD-3-Clause
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.7.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: libzstd-devel
BuildRequires: python-rpm-macros
BuildRequires: zstd = 1.5.7
Requires: python-cffi >= 1.11
Requires: zstd
# SECTION test requirements
BuildRequires: %{python_module cffi >= 1.11}
BuildRequires: %{python_module exceptiongroup}
BuildRequires: %{python_module hypothesis}
BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module pytest}
# /SECTION
%python_subpackages
%description
Zstandard bindings for Python
%prep
%autosetup -p1 -n zstandard-%{version}
%build
export CFLAGS="%{optflags}"
%python_build --system-zstd
%install
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
# remove srcdir for tests collection of installed lib
mv zstandard zstandard.moved
%pytest_arch
%files %{python_files}
%doc README.rst
%license LICENSE
%{python_sitearch}/zstandard
%{python_sitearch}/zstandard-%{version}*-info
%changelog

3
zstandard-0.22.0.tar.gz Normal file
View File

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