[pytables] 03/20: Refresh all patches
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Fri Aug 14 19:00:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository pytables.
commit 82c37b60f4d36ad463ffd55908cb5224267d6d92
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Sat Jul 25 12:27:51 2015 +0000
Refresh all patches
---
debian/changelog | 5 +++
debian/patches/0001-use-dynamic-lib.patch | 4 +-
.../patches/0002-Use-system-compression-libs.patch | 4 +-
...-Better-control-of-verbosity-in-unittests.patch | 33 -----------------
.../0004-Never-use-the-msse2-flag-explicitly.patch | 27 ++++++++------
...Do-not-fetch-icons-for-external-web-sites.patch | 4 +-
...mport-issue-with-cython-newer-than-0.20.2.patch | 21 -----------
...desable-tests-that-use-the-lz4-conpressor.patch | 43 +++++++++-------------
debian/patches/series | 2 -
9 files changed, 43 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3037671..c9dc177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ pytables (3.2.1-1) UNRELEASED; urgency=medium
* New upstream version
* Fix debian/watch file
+ * debian/patches
+ - refresh all patches
+ - drop 0003-Better-control-of-verbosity-in-unittests.patch and
+ 0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
+ (applied upstream)
-- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 22 Mar 2015 18:43:52 +0000
diff --git a/debian/patches/0001-use-dynamic-lib.patch b/debian/patches/0001-use-dynamic-lib.patch
index bce7cbe..a840390 100644
--- a/debian/patches/0001-use-dynamic-lib.patch
+++ b/debian/patches/0001-use-dynamic-lib.patch
@@ -14,10 +14,10 @@ sthe setup script
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 0f2f3f7..555e3dc 100755
+index 2c0c126..27710e3 100755
--- a/setup.py
+++ b/setup.py
-@@ -302,7 +302,7 @@ class Package(object):
+@@ -327,7 +327,7 @@ class Package(object):
class PosixPackage(Package):
_library_prefixes = ['lib']
diff --git a/debian/patches/0002-Use-system-compression-libs.patch b/debian/patches/0002-Use-system-compression-libs.patch
index d27a178..27fef0f 100644
--- a/debian/patches/0002-Use-system-compression-libs.patch
+++ b/debian/patches/0002-Use-system-compression-libs.patch
@@ -10,10 +10,10 @@ copies bundled with blosc itself.
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
-index 555e3dc..d9e2ef6 100755
+index 27710e3..4e016de 100755
--- a/setup.py
+++ b/setup.py
-@@ -725,14 +725,15 @@ if 'BLOSC' not in optional_libs:
+@@ -735,14 +735,15 @@ if 'BLOSC' not in optional_libs:
# Blosc + BloscLZ sources
blosc_files += glob.glob('c-blosc/blosc/*.c')
# LZ4 sources
diff --git a/debian/patches/0003-Better-control-of-verbosity-in-unittests.patch b/debian/patches/0003-Better-control-of-verbosity-in-unittests.patch
deleted file mode 100644
index 7a3906d..0000000
--- a/debian/patches/0003-Better-control-of-verbosity-in-unittests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Thu, 3 Apr 2014 19:55:57 +0000
-Subject: Better control of verbosity in unittests
-
----
- tables/tests/test_all.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tables/tests/test_all.py b/tables/tests/test_all.py
-index e0564f7..0efe394 100644
---- a/tables/tests/test_all.py
-+++ b/tables/tests/test_all.py
-@@ -163,16 +163,17 @@ def test(verbose=False, heavy=False):
- print_heavy(heavy)
-
- # What a context this is!
-- oldverbose, common.verbose = common.verbose, verbose
-+ #oldverbose, common.verbose = common.verbose, verbose
-+ verbosity = 1 + int(verbose)
- oldheavy, common.heavy = common.heavy, heavy
- try:
-- result = unittest.TextTestRunner().run(suite())
-+ result = unittest.TextTestRunner(verbosity=verbosity).run(suite())
- if result.wasSuccessful():
- return 0
- else:
- return 1
- finally:
-- common.verbose = oldverbose
-+ #common.verbose = oldverbose
- common.heavy = oldheavy # there are pretty young heavies, too ;)
-
-
diff --git a/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch b/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
index 45b85a5..7174d8b 100644
--- a/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
+++ b/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
@@ -1,21 +1,24 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 12 Apr 2014 18:21:23 +0000
-Subject: Never use the msse2 flag explicitly
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Sat, 25 Jul 2015 17:50:31 +0000
+Subject: Never-use-the-msse2-flag-explicitly
+===================================================================
---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index d9e2ef6..ab55629 100755
+index 4e016de..990e3fe 100755
--- a/setup.py
+++ b/setup.py
-@@ -752,7 +752,7 @@ if 'BLOSC' not in optional_libs:
+@@ -762,7 +762,8 @@ if 'BLOSC' not in optional_libs:
finally:
os.remove(fd.name)
-- if compiler_has_flags(compiler, ["-msse2"]):
-+ if False and compiler_has_flags(compiler, ["-msse2"]):
- print("Setting compiler flag '-msse2'")
- CFLAGS.append("-msse2")
- else:
+- try_flags = ["-march=native", "-msse2"]
++ #try_flags = ["-march=native", "-msse2"]
++ try_flags = []
+ for ff in try_flags:
+ if compiler_has_flags(compiler, [ff]):
+ print("Setting compiler flag: " + ff)
diff --git a/debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch b/debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch
index 6afc2a2..81a2ec5 100644
--- a/debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch
+++ b/debian/patches/0005-Do-not-fetch-icons-for-external-web-sites.patch
@@ -7,10 +7,10 @@ Subject: Do not fetch icons for external web sites
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 3a1d04b..51eade8 100644
+index 2c88394..7e5aea6 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -182,7 +182,7 @@ html_static_path = ['_static']
+@@ -194,7 +194,7 @@ html_static_path = ['_static']
# Custom sidebar templates, maps document names to template names.
html_sidebars = {
'index': ['globaltoc.html', 'relations.html', 'sourcelink.html',
diff --git a/debian/patches/0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch b/debian/patches/0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
deleted file mode 100644
index db27d40..0000000
--- a/debian/patches/0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Thu, 19 Jun 2014 20:20:29 +0000
-Subject: fix an import issue with cython newer than 0.20.2
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index ab55629..3772f44 100755
---- a/setup.py
-+++ b/setup.py
-@@ -123,7 +123,7 @@ if not has_setuptools:
- # Check if Cython is installed or not (requisite)
- try:
- from Cython.Distutils import build_ext
-- from Cython.Compiler.Main import Version
-+ from Cython.Compiler import Version
- cmdclass['build_ext'] = build_ext
- except ImportError:
- exit_with_error(
diff --git a/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch b/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
index 47b11a9..4536e84 100644
--- a/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
+++ b/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
@@ -1,32 +1,23 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Fri, 15 Aug 2014 07:27:45 +0000
-Subject: Temporay desable tests that use the lz4 conpressor
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Sat, 25 Jul 2015 17:50:31 +0000
+Subject: Temporay-desable-tests-that-use-the-lz4-conpressor
-The lz4 compression library (r119) seems to have some problem
-on the s390x platform (see #757581).
-PyTables tests that use the lz4 compressor are temporary disabled
-(on s390 platforms) in order to avoid to block the upcoming
-auto-hdf5 trasnition.
-
-Tests will be re-enabled as soon as the #757581 is closed.
+===================================================================
---
- tables/tests/test_tables.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ tables/tests/test_tables.py | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/tables/tests/test_tables.py b/tables/tests/test_tables.py
-index c6396d1..ea79d5c 100644
+index 7f0d2ac..64b6335 100644
--- a/tables/tests/test_tables.py
+++ b/tables/tests/test_tables.py
-@@ -6743,8 +6743,10 @@ def suite():
- theSuite.addTest(unittest.makeSuite(
- CompressBloscBloscLZTablesTestCase))
- if 'lz4' in tables.blosc_compressor_list():
-- theSuite.addTest(unittest.makeSuite(
-- CompressBloscLZ4TablesTestCase))
-+ import platform
-+ if 's390x' not in platform.platform().lower():
-+ theSuite.addTest(unittest.makeSuite(
-+ CompressBloscLZ4TablesTestCase))
- theSuite.addTest(unittest.makeSuite(
- CompressBloscLZ4HCTablesTestCase))
- if 'snappy' in tables.blosc_compressor_list():
+@@ -1577,6 +1577,8 @@ class CompressBloscShuffleTablesTestCase(BasicTestCase):
+ complib = "blosc"
+
+
++import platform
++ at unittest.skipIf('s390x' in platform.platform().lower(), 'lz4 required')
+ @unittest.skipIf(not common.blosc_avail,
+ 'BLOSC compression library not available')
+ class CompressBloscBloscLZTablesTestCase(BasicTestCase):
diff --git a/debian/patches/series b/debian/patches/series
index 3f427ea..fcf0774 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
0001-use-dynamic-lib.patch
0002-Use-system-compression-libs.patch
-0003-Better-control-of-verbosity-in-unittests.patch
0004-Never-use-the-msse2-flag-explicitly.patch
0005-Do-not-fetch-icons-for-external-web-sites.patch
-0006-fix-an-import-issue-with-cython-newer-than-0.20.2.patch
0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git
More information about the debian-science-commits
mailing list