[pytables] 01/01: Remove old patches and fix compatibility with python 2.7.13

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Wed Dec 7 13:12:38 UTC 2016 

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 824aed917cba01ee6f25148c96ff6f36ec9a6e2c
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Wed Dec 7 12:13:44 2016 +0000

    Remove old patches and fix compatibility with python 2.7.13
---
 debian/changelog                                   | 10 +++-
 .../0002-Never-use-the-msse2-flag-explicitly.patch |  3 +-
 .../patches/0006-Disable-tests-on-bitshuffle.patch | 61 ----------------------
 ...=> 0006-allow-for-long-type-in-nextafter.patch} |  0
 debian/patches/0007-fix-base-class-order.patch     | 39 ++++++++++++++
 debian/patches/series                              |  4 +-
 6 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c30e529..955310f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,17 @@ pytables (3.3.0-5) unstable; urgency=medium
   * debian/rules
     - typo in BUILD_DATE
   * debian/patches
-    - new 0007-allow-for-long-type-in-nextafter.patch.
+    - removed 0006-Disable-tests-on-bitshuffle.patch
+      It is no longer necessary after the fix of #844047 in
+      c-blosc 1.11.1+ds1-3
+    - new 0006-allow-for-long-type-in-nextafter.patch.
       Imported from upstream  (see also
       https://github.com/PyTables/PyTables/pull/587)
+    - new 0007-fix-base-class-order.patch to fix compatibility with
+      Python v2.7.13.
+      See also https://github.com/PyTables/PyTables/issues/590
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 03 Dec 2016 19:39:23 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 07 Dec 2016 13:19:56 +0100
 
 pytables (3.3.0-4) unstable; urgency=medium
 
diff --git a/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch b/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch
index 12d47c1..2c105e0 100644
--- a/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch
+++ b/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch
@@ -1,4 +1,5 @@
-From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+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
 
diff --git a/debian/patches/0006-Disable-tests-on-bitshuffle.patch b/debian/patches/0006-Disable-tests-on-bitshuffle.patch
deleted file mode 100644
index d2413df..0000000
--- a/debian/patches/0006-Disable-tests-on-bitshuffle.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Thu, 3 Nov 2016 19:00:40 +0100
-Subject: Disable tests on bitshuffle
-
----
- tables/tests/test_carray.py  | 1 +
- tables/tests/test_create.py  | 2 ++
- tables/tests/test_tables.py  | 1 +
- tables/tests/test_vlarray.py | 2 ++
- 4 files changed, 6 insertions(+)
-
-diff --git a/tables/tests/test_carray.py b/tables/tests/test_carray.py
-index 3c0eede..030f131 100644
---- a/tables/tests/test_carray.py
-+++ b/tables/tests/test_carray.py
-@@ -672,6 +672,7 @@ class BloscShuffleTestCase(BasicTestCase):
-     step = 7
- 
- 
-+ at unittest.skip('temporarily disabled')
- @unittest.skipIf(not common.blosc_avail,
-                  'BLOSC compression library not available')
- @unittest.skipIf(blosc_version < common.min_blosc_bitshuffle_version,
-diff --git a/tables/tests/test_create.py b/tables/tests/test_create.py
-index 8d25020..7d72e50 100644
---- a/tables/tests/test_create.py
-+++ b/tables/tests/test_create.py
-@@ -664,6 +664,8 @@ class FiltersCaseBloscZstd(FiltersTreeTestCase):
-     gfilters = Filters(complevel=5, shuffle=True, complib="blosc:zstd")
-     open_kwargs = dict(filters=filters)
- 
-+
-+ at unittest.skip('temporarily disabled')
- @unittest.skipIf(not common.blosc_avail,
-                  'BLOSC compression library not available')
- @unittest.skipIf(blosc_version < common.min_blosc_bitshuffle_version,
-diff --git a/tables/tests/test_tables.py b/tables/tests/test_tables.py
-index 0ff6fb7..069b9d4 100644
---- a/tables/tests/test_tables.py
-+++ b/tables/tests/test_tables.py
-@@ -1694,6 +1694,7 @@ class CompressBloscShuffleTablesTestCase(BasicTestCase):
-     complib = "blosc"
- 
- 
-+ at unittest.skip('temporarily disabled')
- @unittest.skipIf(not common.blosc_avail,
-                  'BLOSC compression library not available')
- @unittest.skipIf(blosc_version < common.min_blosc_bitshuffle_version,
-diff --git a/tables/tests/test_vlarray.py b/tables/tests/test_vlarray.py
-index 4f9c8d2..04a4e63 100644
---- a/tables/tests/test_vlarray.py
-+++ b/tables/tests/test_vlarray.py
-@@ -284,6 +284,8 @@ class BloscShuffleComprTestCase(BasicTestCase):
-     shuffle = 1
-     complib = "blosc"
- 
-+
-+ at unittest.skip('temporarily disabled')
- @unittest.skipIf(not common.blosc_avail,
-                  'BLOSC compression library not available')
- @unittest.skipIf(blosc_version < common.min_blosc_bitshuffle_version,
diff --git a/debian/patches/0007-allow-for-long-type-in-nextafter.patch b/debian/patches/0006-allow-for-long-type-in-nextafter.patch
similarity index 100%
rename from debian/patches/0007-allow-for-long-type-in-nextafter.patch
rename to debian/patches/0006-allow-for-long-type-in-nextafter.patch
diff --git a/debian/patches/0007-fix-base-class-order.patch b/debian/patches/0007-fix-base-class-order.patch
new file mode 100644
index 0000000..e426deb
--- /dev/null
+++ b/debian/patches/0007-fix-base-class-order.patch
@@ -0,0 +1,39 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Wed, 7 Dec 2016 11:31:06 +0000
+Subject: fix base class order
+
+---
+ tables/indexes.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tables/indexes.py b/tables/indexes.py
+index 4074d51..83f941a 100644
+--- a/tables/indexes.py
++++ b/tables/indexes.py
+@@ -25,7 +25,7 @@ from . import indexesextension
+ # Declarations for inheriting
+ 
+ 
+-class CacheArray(NotLoggedMixin, EArray, indexesextension.CacheArray):
++class CacheArray(indexesextension.CacheArray, NotLoggedMixin, EArray):
+     """Container for keeping index caches of 1st and 2nd level."""
+ 
+     # Class identifier.
+@@ -33,7 +33,7 @@ class CacheArray(NotLoggedMixin, EArray, indexesextension.CacheArray):
+ 
+ 
+ 
+-class LastRowArray(NotLoggedMixin, CArray, indexesextension.LastRowArray):
++class LastRowArray(indexesextension.LastRowArray, NotLoggedMixin, CArray):
+     """Container for keeping sorted and indices values of last row of an
+     index."""
+ 
+@@ -42,7 +42,7 @@ class LastRowArray(NotLoggedMixin, CArray, indexesextension.LastRowArray):
+ 
+ 
+ 
+-class IndexArray(NotLoggedMixin, EArray, indexesextension.IndexArray):
++class IndexArray(indexesextension.IndexArray, NotLoggedMixin, EArray):
+     """Represent the index (sorted or reverse index) dataset in HDF5 file.
+ 
+     All NumPy typecodes are supported except for complex datatypes.
diff --git a/debian/patches/series b/debian/patches/series
index 04e32a6..089e93e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,5 @@
 0003-Do-not-fetch-icons-for-external-web-sites.patch
 0004-fix-compatibility-with-HDF5-1.10.patch
 0005-Ignore-cpuinfo-on-unsupported-archs.patch
-0006-Disable-tests-on-bitshuffle.patch
-0007-allow-for-long-type-in-nextafter.patch
+0006-allow-for-long-type-in-nextafter.patch
+0007-fix-base-class-order.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