diff --git a/.gitignore b/.gitignore index e97613f..9580742 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /numcodecs-0.6.3.tar.gz /numcodecs-0.6.4.tar.gz +/numcodecs-0.7.0.tar.gz diff --git a/0001-Unbundle-blosc.patch b/0001-Unbundle-blosc.patch index efce594..58d92a0 100644 --- a/0001-Unbundle-blosc.patch +++ b/0001-Unbundle-blosc.patch @@ -1,4 +1,4 @@ -From 238cfa349a91447fbdfc2617b2db3025127da161 Mon Sep 17 00:00:00 2001 +From 0aac3c69fa6c9a9a185595f631e78486a983ae5f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 00:17:41 -0400 Subject: [PATCH 1/3] Unbundle blosc. @@ -9,18 +9,17 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/setup.py b/setup.py -index 4c23dfc..12f022f 100644 +index 3cf27db..a288915 100644 --- a/setup.py +++ b/setup.py -@@ -2,6 +2,7 @@ - from __future__ import absolute_import, print_function, division +@@ -1,5 +1,6 @@ from glob import glob import os +import subprocess from setuptools import setup, Extension import cpuinfo import sys -@@ -63,6 +64,12 @@ def error(*msg): +@@ -53,6 +54,12 @@ def error(*msg): print('[numcodecs]', *msg, **kwargs) @@ -33,7 +32,7 @@ index 4c23dfc..12f022f 100644 def blosc_extension(): info('setting up Blosc extension') -@@ -70,47 +77,8 @@ def blosc_extension(): +@@ -60,47 +67,8 @@ def blosc_extension(): define_macros = [] # setup blosc sources @@ -83,7 +82,7 @@ index 4c23dfc..12f022f 100644 if have_cython: sources = ['numcodecs/blosc.pyx'] -@@ -120,10 +88,10 @@ def blosc_extension(): +@@ -110,10 +78,10 @@ def blosc_extension(): # define extension module extensions = [ Extension('numcodecs.blosc', @@ -97,5 +96,5 @@ index 4c23dfc..12f022f 100644 ] -- -2.21.0 +2.26.2 diff --git a/0002-Unbundle-zstd.patch b/0002-Unbundle-zstd.patch index 75a9c64..e144226 100644 --- a/0002-Unbundle-zstd.patch +++ b/0002-Unbundle-zstd.patch @@ -1,4 +1,4 @@ -From 5efcb75b07c7d64a4a6a213d08c0863624b44255 Mon Sep 17 00:00:00 2001 +From 54562ba49b0c916fd1405ece0f019698e61ac275 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 00:21:57 -0400 Subject: [PATCH 2/3] Unbundle zstd. @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py -index 12f022f..c86adf3 100644 +index a288915..d6aad92 100644 --- a/setup.py +++ b/setup.py -@@ -104,21 +104,11 @@ def blosc_extension(): +@@ -94,21 +94,11 @@ def blosc_extension(): def zstd_extension(): info('setting up Zstandard extension') @@ -36,7 +36,7 @@ index 12f022f..c86adf3 100644 if have_cython: sources = ['numcodecs/zstd.pyx'] -@@ -128,10 +118,9 @@ def zstd_extension(): +@@ -118,10 +108,9 @@ def zstd_extension(): # define extension module extensions = [ Extension('numcodecs.zstd', @@ -50,5 +50,5 @@ index 12f022f..c86adf3 100644 ] -- -2.21.0 +2.26.2 diff --git a/0003-Unbundle-lz4.patch b/0003-Unbundle-lz4.patch index 7fea379..a4be07b 100644 --- a/0003-Unbundle-lz4.patch +++ b/0003-Unbundle-lz4.patch @@ -1,4 +1,4 @@ -From cf89db63d52d1a0a709d61971927193e62aed7ca Mon Sep 17 00:00:00 2001 +From ac4552968d18752d7fd4f17a7de2334da1d5ad4c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 16 Mar 2019 00:23:50 -0400 Subject: [PATCH 3/3] Unbundle lz4. @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py -index c86adf3..ba33379 100644 +index d6aad92..e13bf72 100644 --- a/setup.py +++ b/setup.py -@@ -134,13 +134,10 @@ def lz4_extension(): +@@ -124,13 +124,10 @@ def lz4_extension(): info('setting up LZ4 extension') extra_compile_args = list(base_compile_args) @@ -29,7 +29,7 @@ index c86adf3..ba33379 100644 if have_cython: sources = ['numcodecs/lz4.pyx'] -@@ -150,10 +147,9 @@ def lz4_extension(): +@@ -140,10 +137,9 @@ def lz4_extension(): # define extension module extensions = [ Extension('numcodecs.lz4', @@ -43,5 +43,5 @@ index c86adf3..ba33379 100644 ] -- -2.21.0 +2.26.2 diff --git a/python-numcodecs.spec b/python-numcodecs.spec index c0eadfc..2706e3f 100644 --- a/python-numcodecs.spec +++ b/python-numcodecs.spec @@ -1,8 +1,8 @@ %global srcname numcodecs Name: python-%{srcname} -Version: 0.6.4 -Release: 5%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Buffer compression and transformation for data storage and communication License: MIT @@ -61,6 +61,9 @@ rm -rf %{srcname}.egg-info # Remove bundled blosc rm -rf c-blosc +# Remove generated Cython files +rm numcodecs/{blosc,compat_ext,lz4,vlen,zstd}.c + %build %py3_build @@ -94,6 +97,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Wed Sep 09 2020 Elliott Sales de Andrade - 0.7.0-1 +- Update to latest version (#1877567) + * Sat Aug 01 2020 Fedora Release Engineering - 0.6.4-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index ad1926a..3144f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (numcodecs-0.6.4.tar.gz) = c571518849b130184faa426c434ba5963b7de170dccfb8aef0ac5aa43a0cfc923423dacc8e21a5db5c4c674e693aa4550a018333e5a82c2eeec6e678f93b7b41 +SHA512 (numcodecs-0.7.0.tar.gz) = f34ec1a2e01f18283bc709a5b24d49f95eb568ba51fbf31597da65e5880d45e693b8d7491748588543fe309fb0a2969508248451cc6c6595c008be57357023b0