update to 0.16.0 (#2014873)

drop obsolete patch
improve patch for inconsistent `closed` attribute issue
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2021-10-18 14:07:32 +02:00
parent 16c372383c
commit fd918ee72e
5 changed files with 46 additions and 62 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/zstandard-0.13.0.tar.gz
/zstandard-0.15.1.tar.gz
/zstandard-0.15.2.tar.gz
/zstandard-0.16.0.tar.gz

View File

@ -1,12 +0,0 @@
diff -up zstandard-0.15.1/tests/test_data_structures.py.orig zstandard-0.15.1/tests/test_data_structures.py
--- zstandard-0.15.1/tests/test_data_structures.py.orig 1970-01-01 01:00:00.000000000 +0100
+++ zstandard-0.15.1/tests/test_data_structures.py 2021-02-03 12:41:52.539183516 +0100
@@ -102,7 +102,7 @@ class TestCompressionParameters(unittest
# 32-bit has slightly different values from 64-bit.
self.assertAlmostEqual(
- p.estimated_compression_context_size(), 1295064, delta=400
+ p.estimated_compression_context_size(), 1295064, delta=500
)
def test_strategy(self):

View File

@ -1,48 +1,39 @@
diff -up zstandard-0.15.1/c-ext/compressionreader.c.orig zstandard-0.15.1/c-ext/compressionreader.c
--- zstandard-0.15.1/c-ext/compressionreader.c.orig 2020-12-31 23:18:06.000000000 +0000
+++ zstandard-0.15.1/c-ext/compressionreader.c 2021-03-01 11:41:09.056060857 +0000
@@ -793,7 +793,7 @@ static PyMethodDef compressionreader_met
{NULL, NULL}};
diff -up zstandard-0.16.0/c-ext/python-zstandard.h.orig zstandard-0.16.0/c-ext/python-zstandard.h
--- zstandard-0.16.0/c-ext/python-zstandard.h.orig 2021-10-16 23:41:56.000000000 +0200
+++ zstandard-0.16.0/c-ext/python-zstandard.h 2021-10-18 12:54:19.526520178 +0200
@@ -126,7 +126,7 @@ typedef struct {
size_t outSize;
int entered;
int closing;
- int closed;
+ char closed;
int writeReturnRead;
int closefd;
unsigned long long bytesCompressed;
@@ -163,7 +163,7 @@ typedef struct {
int closefd;
static PyMemberDef compressionreader_members[] = {
- {"closed", T_BOOL, offsetof(ZstdCompressionReader, closed), READONLY,
+ {"closed", T_INT, offsetof(ZstdCompressionReader, closed), READONLY,
"whether stream is closed"},
{NULL}};
int entered;
- int closed;
+ char closed;
unsigned long long bytesCompressed;
diff -up zstandard-0.15.1/c-ext/decompressionreader.c.orig zstandard-0.15.1/c-ext/decompressionreader.c
--- zstandard-0.15.1/c-ext/decompressionreader.c.orig 2020-12-31 23:18:06.000000000 +0000
+++ zstandard-0.15.1/c-ext/decompressionreader.c 2021-03-01 11:40:35.686060857 +0000
@@ -761,7 +761,7 @@ static PyMethodDef decompressionreader_m
{NULL, NULL}};
static PyMemberDef decompressionreader_members[] = {
- {"closed", T_BOOL, offsetof(ZstdDecompressionReader, closed), READONLY,
+ {"closed", T_INT, offsetof(ZstdDecompressionReader, closed), READONLY,
"whether stream is closed"},
{NULL}};
diff -up zstandard-0.15.1/c-ext/compressionwriter.c.orig zstandard-0.15.1/c-ext/compressionwriter.c
--- zstandard-0.15.1/c-ext/compressionwriter.c.orig 2020-12-31 23:18:06.000000000 +0000
+++ zstandard-0.15.1/c-ext/compressionwriter.c 2021-03-01 11:50:29.546150542 +0000
@@ -323,7 +323,7 @@ static PyMethodDef ZstdCompressionWriter
{NULL, NULL}};
static PyMemberDef ZstdCompressionWriter_members[] = {
- {"closed", T_BOOL, offsetof(ZstdCompressionWriter, closed), READONLY, NULL},
+ {"closed", T_INT, offsetof(ZstdCompressionWriter, closed), READONLY, NULL},
{NULL}};
PyTypeObject ZstdCompressionWriterType = {
diff -up zstandard-0.15.1/c-ext/decompressionwriter.c.orig zstandard-0.15.1/c-ext/decompressionwriter.c
--- zstandard-0.15.1/c-ext/decompressionwriter.c.orig 2020-12-31 23:18:06.000000000 +0000
+++ zstandard-0.15.1/c-ext/decompressionwriter.c 2021-03-01 11:49:31.386150542 +0000
@@ -243,7 +243,7 @@ static PyMethodDef ZstdDecompressionWrit
{NULL, NULL}};
static PyMemberDef ZstdDecompressionWriter_members[] = {
- {"closed", T_BOOL, offsetof(ZstdDecompressionWriter, closed), READONLY,
+ {"closed", T_INT, offsetof(ZstdDecompressionWriter, closed), READONLY,
NULL},
{NULL}};
ZSTD_inBuffer input;
@@ -243,7 +243,7 @@ typedef struct {
/* Whether the context manager is active. */
int entered;
/* Whether we've closed the stream. */
- int closed;
+ char closed;
/* Number of bytes decompressed and returned to user. */
unsigned long long bytesDecompressed;
@@ -270,7 +270,7 @@ typedef struct {
size_t outSize;
int entered;
int closing;
- int closed;
+ char closed;
int writeReturnRead;
int closefd;
} ZstdDecompressionWriter;

View File

@ -13,13 +13,13 @@
compression library. A C extension and CFFI interface are provided.
Name: python-%{pypi_name}
Version: 0.15.2
Version: 0.16.0
Release: 1%{?dist}
Summary: Zstandard bindings for Python
License: BSD and GPLv2
URL: https://github.com/indygreg/python-zstandard
Source0: %{pypi_source}
Patch0: %{name}-fix-estimated_compression_context_size-tolerance-i686.patch
# https://github.com/indygreg/python-zstandard/issues/105
Patch1: %{name}-issue-105.patch
%description
@ -37,14 +37,13 @@ BuildRequires: python3-pytest
BuildRequires: python3-pytest-xdist
%endif
# https://github.com/indygreg/python-zstandard/issues/48
Provides: bundled(zstd) = 1.4.8
Provides: bundled(zstd) = 1.5.0
%description -n python3-%{pypi_name}
%{desc}
%prep
%setup -q -n %{pypi_name}-%{version}
%patch0 -p1
%patch1 -p1
rm -r %{pypi_name}.egg-info
@ -70,6 +69,11 @@ mv zstandard{.src,}
%{python3_sitearch}/%{pypi_name}
%changelog
* Mon Oct 18 2021 Dominik Mierzejewski <dominik@greysector.net> 0.16.0-1
- update to 0.16.0 (#2014873)
- drop obsolete patch
- improve patch for inconsistent `closed` attribute issue
* Mon Mar 01 2021 Dominik Mierzejewski <dominik@greysector.net> 0.15.2-1
- update to 0.15.2 (#1933476)
- fix tests on s390x

View File

@ -1 +1 @@
SHA512 (zstandard-0.15.2.tar.gz) = 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
SHA512 (zstandard-0.16.0.tar.gz) = f528cace58c1f1ec0fbea96e1646d92b05077ab6f5919eec07dc7b4fcfadf97dc848238928276fdb4333fb2cd035509af472ee352608661c3de681bc8dbed318