From b62540ff25012f23b66a640c755f88b8a9a5245c Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 16 2015 18:53:31 +0000 Subject: Update to 1.2.8 --- diff --git a/.gitignore b/.gitignore index 4be21f8..1c4c1bd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /blosc-1.2.4.tar.gz /blosc-1.2.5.tar.gz /blosc-1.2.7.tar.gz +/blosc-1.2.8.tar.gz diff --git a/0001-Allow-verbosity-to-be-specified-when-running-test-su.patch b/0001-Allow-verbosity-to-be-specified-when-running-test-su.patch deleted file mode 100644 index e4d13c8..0000000 --- a/0001-Allow-verbosity-to-be-specified-when-running-test-su.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b6c85062b316ecd4606c64b449fe0c8ec5d2a708 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 29 May 2015 13:15:40 -0400 -Subject: [PATCH 1/2] Allow verbosity to be specified when running test suite - ---- - blosc/test.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blosc/test.py b/blosc/test.py -index c7227451d9..0a12fb0107 100644 ---- a/blosc/test.py -+++ b/blosc/test.py -@@ -177,7 +177,7 @@ class TestCodec(unittest.TestCase): - self.assertRaises(TypeError, blosc.unpack_array, 1.0) - - --def run(): -+def run(verbosity=2): - import blosc - import blosc.toplevel - blosc.print_versions() -@@ -187,7 +187,7 @@ def run(): - - # suite = unittest.TestLoader().discover(start_dir='.', pattern='test*.py') - suite.addTests(unittest.TestLoader().loadTestsFromModule(blosc.toplevel)) -- unittest.TextTestRunner(verbosity=2).run(suite) -+ unittest.TextTestRunner(verbosity=verbosity).run(suite) - - - if __name__ == '__main__': --- -2.1.0 - diff --git a/0002-Propagate-the-result-of-tests.patch b/0002-Propagate-the-result-of-tests.patch deleted file mode 100644 index a148166..0000000 --- a/0002-Propagate-the-result-of-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 16688ab07612e4f022b3118e7a18660ffdfcb106 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 29 May 2015 13:16:52 -0400 -Subject: [PATCH] Propagate the result of tests - -This way things like - python -c 'import sys, blosc; sys.exit(blosc.test())' -actually fail if tests fail. ---- - blosc/test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blosc/test.py b/blosc/test.py -index 0a12fb0107..760db66296 100644 ---- a/blosc/test.py -+++ b/blosc/test.py -@@ -187,7 +187,7 @@ def run(verbosity=2): - - # suite = unittest.TestLoader().discover(start_dir='.', pattern='test*.py') - suite.addTests(unittest.TestLoader().loadTestsFromModule(blosc.toplevel)) -- unittest.TextTestRunner(verbosity=verbosity).run(suite) -+ assert unittest.TextTestRunner(verbosity=verbosity).run(suite).wasSuccessful() - - - if __name__ == '__main__': --- -2.1.0 - diff --git a/python-blosc.spec b/python-blosc.spec index 8090125..3438bd0 100644 --- a/python-blosc.spec +++ b/python-blosc.spec @@ -8,33 +8,41 @@ # Use the same directory of the main package for subpackage licence and docs %global _docdir_fmt %{name} -Summary: Python wrapper for the blosc high performance compressor +Summary: Python wrapper for the Blosc high performance compressor Name: python-%{module} -Version: 1.2.7 -Release: 5%{?dist} +Version: 1.2.8 +Release: 1%{?dist} License: MIT URL: https://github.com/FrancescAlted/python-blosc Source0: https://pypi.python.org/packages/source/b/%{module}/%{module}-%{version}.tar.gz -Patch0: 0001-Allow-verbosity-to-be-specified-when-running-test-su.patch -Patch1: 0002-Propagate-the-result-of-tests.patch BuildRequires: blosc-devel BuildRequires: python2-devel BuildRequires: numpy -Recommends: numpy %description -Python wrapper for the Blosc high performance compressor. +%{summary}. + +%package -n python2-%{module} +Summary: %{summary} + +%{?python_provide:%python_provide python2-blosc} +%{?fedora:Recommends: numpy} + +%description -n python2-%{module} +%{summary}. %if 0%{?with_python3} %package -n python3-%{module} Summary: Python wrapper for the blosc high performance compressor + BuildRequires: python3-devel BuildRequires: python3-numpy -Recommends: python3-numpy +%{?python_provide:%python_provide python3-blosc} +%{?fedora:Recommends: python3-numpy} %description -n python3-%{module} -Python wrapper for the Blosc high performance compressor. +%{summary}. %endif %prep @@ -45,18 +53,18 @@ sed -i "s|CFLAGS\.append(\"-msse2\")|pass|" setup.py %build export BLOSC_DIR=%{_libdir}/blosc CFLAGS="%{optflags}" -%{__python2} setup.py build +%py2_build %if 0%{?with_python3} -%{__python3} setup.py build +%py3_build %endif %install -%{__python2} setup.py install --prefix=%{_prefix} -O1 --skip-build --root=%{buildroot} +%py2_install %if 0%{?with_python3} -%{__python3} setup.py install --prefix=%{_prefix} -O1 --skip-build --root=%{buildroot} +%py3_install %endif -%files +%files -n python2-%{module} %{python2_sitearch}/blosc/ %{python2_sitearch}/blosc-%{version}*-py*.egg-info %license LICENSES/PYTHON-BLOSC.txt @@ -78,7 +86,11 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} python3 -c 'import sys, blosc; sys.ex %endif %changelog -* Tue Nov 10 2015 Fedora Release Engineering +* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek - 1.2.8-1 +- Update to latest version (#1263680) +- Add python2 subpackage following the latest guidelines + +* Tue Nov 10 2015 Fedora Release Engineering - 1.2.7-5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 * Thu Jun 18 2015 Fedora Release Engineering - 1.2.7-4 diff --git a/sources b/sources index 60d53e0..63e3e9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4661af9ef228971d851852fa3c468416 blosc-1.2.7.tar.gz +d7f505adefd46fbdb50c7b608d5cbdf6 blosc-1.2.8.tar.gz