[pytables] 06/15: Refresh all patches
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Fri Jun 30 18:07:43 UTC 2017
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 b80551ce153b791daee46304d1aa016da3d22c63
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Wed Jun 28 22:53:49 2017 +0200
Refresh all patches
---
debian/changelog | 6 +
debian/patches/0001-use-dynamic-lib.patch | 4 +-
.../0002-Never-use-the-msse2-flag-explicitly.patch | 26 +-
...Do-not-fetch-icons-for-external-web-sites.patch | 21 --
.../0004-fix-compatibility-with-HDF5-1.10.patch | 329 ---------------------
.../0005-Ignore-cpuinfo-on-unsupported-archs.patch | 46 ---
.../0006-allow-for-long-type-in-nextafter.patch | 29 --
debian/patches/0007-fix-base-class-order.patch | 39 ---
debian/patches/series | 5 -
9 files changed, 20 insertions(+), 485 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 16d2991..1fc3603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ pytables (3.4.2-1) UNRELEASED; urgency=medium
* Standard version bumped to v4.0.0 (non change)
* Ensure that autopkgtest scripts return the correct exit code
(Closes: #864395)
+ * debian/patches:
+ - drop 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 and
+ 0006-allow-for-long-type-in-nextafter: applied upstream
+ - refresh remainimg patches
-- Antonio Valentino <antonio.valentino at tiscali.it> Wed, 28 Jun 2017 20:25:32 +0000
diff --git a/debian/patches/0001-use-dynamic-lib.patch b/debian/patches/0001-use-dynamic-lib.patch
index 85e7e6a..c979618 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 6b64a57..0d9b408 100755
+index b5c55ba..ee769e6 100755
--- a/setup.py
+++ b/setup.py
-@@ -308,7 +308,7 @@ class Package(object):
+@@ -316,7 +316,7 @@ class Package(object):
class PosixPackage(Package):
_library_prefixes = ['lib']
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 2c105e0..b20136c 100644
--- a/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch
+++ b/debian/patches/0002-Never-use-the-msse2-flag-explicitly.patch
@@ -5,30 +5,28 @@ Subject: Never-use-the-msse2-flag-explicitly
===================================================================
---
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
-index 0d9b408..cf04824 100755
+index ee769e6..2cd6b1d 100755
--- a/setup.py
+++ b/setup.py
-@@ -812,7 +812,7 @@ if 'BLOSC' not in optional_libs:
+@@ -836,7 +836,7 @@ if 'BLOSC' not in optional_libs:
os.remove(fd.name)
# SSE2
-- if 'sse2' in cpu_info['flags']:
-+ if False and ('sse2' in cpu_info['flags']):
+- if 'sse2' in cpu_flags:
++ if False and 'sse2' in cpu_flags:
print('SSE2 detected')
CFLAGS.append('-DSHUFFLE_SSE2_ENABLED')
if os.name == 'nt':
-@@ -826,8 +826,8 @@ if 'BLOSC' not in optional_libs:
+@@ -850,7 +850,7 @@ if 'BLOSC' not in optional_libs:
if 'sse2' in f]
# AVX2
# Detection code for AVX2 only works for gcc/clang, not for MSVC yet
-- if ('avx2' in cpu_info['flags'] and
-- compiler_has_flags(compiler, ["-mavx2"])):
-+ if False and ('avx2' in cpu_info['flags'] and
-+ compiler_has_flags(compiler, ["-mavx2"])):
- print('AVX2 detected')
- CFLAGS.append('-DSHUFFLE_AVX2_ENABLED')
- CFLAGS.append('-mavx2')
+- if ('avx2' in cpu_flags and
++ if (False and 'avx2' in cpu_flags and
+ compiler_has_flags(compiler, ["-mavx2"])):
+ print('AVX2 detected')
+ CFLAGS.append('-DSHUFFLE_AVX2_ENABLED')
diff --git a/debian/patches/0003-Do-not-fetch-icons-for-external-web-sites.patch b/debian/patches/0003-Do-not-fetch-icons-for-external-web-sites.patch
deleted file mode 100644
index 81a2ec5..0000000
--- a/debian/patches/0003-Do-not-fetch-icons-for-external-web-sites.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 12 Apr 2014 18:23:37 +0000
-Subject: Do not fetch icons for external web sites
-
----
- doc/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 2c88394..7e5aea6 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -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',
-- 'searchbox.html', 'travis-ci.html']
-+ 'searchbox.html'] #, 'travis-ci.html']
- }
-
- # Additional templates that should be rendered to pages, maps page names to
diff --git a/debian/patches/0004-fix-compatibility-with-HDF5-1.10.patch b/debian/patches/0004-fix-compatibility-with-HDF5-1.10.patch
deleted file mode 100644
index dfe9f58..0000000
--- a/debian/patches/0004-fix-compatibility-with-HDF5-1.10.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Mon, 31 Oct 2016 08:27:44 +0000
-Subject: fix compatibility with HDF5 1.10
-
----
- README.rst | 3 +-
- doc/source/usersguide/installation.rst | 2 +-
- setup.py | 6 +-
- src/H5ARRAY.c | 4 +-
- src/H5ARRAY.h | 2 +-
- src/H5TB-opt.c | 2 +-
- src/H5TB-opt.h | 2 +-
- src/H5VLARRAY.c | 2 +-
- src/H5VLARRAY.h | 2 +-
- tables/definitions.pxd | 105 ++++++++++++++++-----------------
- tables/hdf5extension.pyx | 8 +++
- tables/utilsextension.pyx | 1 +
- 12 files changed, 70 insertions(+), 69 deletions(-)
-
-diff --git a/README.rst b/README.rst
-index 3e73474..68323d8 100644
---- a/README.rst
-+++ b/README.rst
-@@ -105,8 +105,7 @@ optional.
- Installation
- ------------
-
--1. Make sure you have HDF5 version 1.8.4 or above. HDF5 1.10.x is not
--supported.
-+1. Make sure you have HDF5 version 1.8.4 or above.
-
- On OSX you can install HDF5 using `Homebrew <http://brew.sh>`_::
-
-diff --git a/doc/source/usersguide/installation.rst b/doc/source/usersguide/installation.rst
-index 692e3bc..6de34e2 100644
---- a/doc/source/usersguide/installation.rst
-+++ b/doc/source/usersguide/installation.rst
-@@ -49,7 +49,7 @@ Prerequisites
- First, make sure that you have
-
- * Python_ >= 2.7 including Python 3.x
--* HDF5_ >= 1.8.4 (>=1.8.15 is strongly recommended, HDF5 v1.10 not supported)
-+* HDF5_ >= 1.8.4 (>=1.8.15 is strongly recommended)
- * NumPy_ >= 1.8.1
- * Numexpr_ >= 2.5.2
- * Cython_ >= 0.21
-diff --git a/setup.py b/setup.py
-index cf04824..fe2492e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -515,6 +515,7 @@ CFLAGS.append("-Isrc")
- # Force the 1.8.x HDF5 API even if the library as been compiled to use the
- # 1.6.x API by default
- CFLAGS.extend([
-+ "-DH5_USE_18_API",
- "-DH5Acreate_vers=2",
- "-DH5Aiterate_vers=2",
- "-DH5Dcreate_vers=2",
-@@ -572,11 +573,6 @@ for (package, location) in [(hdf5_package, HDF5_DIR),
- "Unsupported HDF5 version! HDF5 v%s+ required. "
- "Found version v%s" % (min_hdf5_version, hdf5_version))
-
-- if hdf5_version >= "1.10":
-- exit_with_error(
-- "HDF5 1.10 release not supported. HDF5 v1.8 release required. "
-- "Found version v%s" % (hdf5_version))
--
- if os.name == 'nt' and hdf5_version < "1.8.10":
- # Change in DLL naming happened in 1.8.10
- hdf5_old_dll_name = 'hdf5dll' if not debug else 'hdf5ddll'
-diff --git a/src/H5ARRAY.c b/src/H5ARRAY.c
-index 4b29c05..3ca25c5 100644
---- a/src/H5ARRAY.c
-+++ b/src/H5ARRAY.c
-@@ -31,7 +31,7 @@
- *-------------------------------------------------------------------------
- */
-
--herr_t H5ARRAYmake( hid_t loc_id,
-+hid_t H5ARRAYmake( hid_t loc_id,
- const char *dset_name,
- const char *obversion,
- const int rank,
-@@ -138,7 +138,7 @@ herr_t H5ARRAYmake( hid_t loc_id,
- blosc_compcode = blosc_compname_to_compcode(blosc_compname);
- cd_values[6] = blosc_compcode;
- if ( H5Pset_filter( plist_id, FILTER_BLOSC, H5Z_FLAG_OPTIONAL, 7, cd_values) < 0 )
-- return -1;
-+ return -1;
- }
- /* The LZO compressor does accept parameters */
- else if (strcmp(complib, "lzo") == 0) {
-diff --git a/src/H5ARRAY.h b/src/H5ARRAY.h
-index 2c1fd40..d49e4fb 100644
---- a/src/H5ARRAY.h
-+++ b/src/H5ARRAY.h
-@@ -13,7 +13,7 @@
- extern "C" {
- #endif
-
--herr_t H5ARRAYmake( hid_t loc_id,
-+hid_t H5ARRAYmake( hid_t loc_id,
- const char *dset_name,
- const char *obversion,
- const int rank,
-diff --git a/src/H5TB-opt.c b/src/H5TB-opt.c
-index 31e7948..c1c1b34 100644
---- a/src/H5TB-opt.c
-+++ b/src/H5TB-opt.c
-@@ -72,7 +72,7 @@
- */
-
-
--herr_t H5TBOmake_table( const char *table_title,
-+hid_t H5TBOmake_table( const char *table_title,
- hid_t loc_id,
- const char *dset_name,
- char *version,
-diff --git a/src/H5TB-opt.h b/src/H5TB-opt.h
-index 8bb2847..4c2243d 100644
---- a/src/H5TB-opt.h
-+++ b/src/H5TB-opt.h
-@@ -4,7 +4,7 @@
- extern "C" {
- #endif
-
--herr_t H5TBOmake_table( const char *table_title,
-+hid_t H5TBOmake_table( const char *table_title,
- hid_t loc_id,
- const char *dset_name,
- char *version,
-diff --git a/src/H5VLARRAY.c b/src/H5VLARRAY.c
-index 86ff545..431b436 100644
---- a/src/H5VLARRAY.c
-+++ b/src/H5VLARRAY.c
-@@ -29,7 +29,7 @@
- *-------------------------------------------------------------------------
- */
-
--herr_t H5VLARRAYmake( hid_t loc_id,
-+hid_t H5VLARRAYmake( hid_t loc_id,
- const char *dset_name,
- const char *obversion,
- const int rank,
-diff --git a/src/H5VLARRAY.h b/src/H5VLARRAY.h
-index c0913b5..a900857 100644
---- a/src/H5VLARRAY.h
-+++ b/src/H5VLARRAY.h
-@@ -7,7 +7,7 @@
- extern "C" {
- #endif
-
--herr_t H5VLARRAYmake( hid_t loc_id,
-+hid_t H5VLARRAYmake( hid_t loc_id,
- const char *dset_name,
- const char *obversion,
- const int rank,
-diff --git a/tables/definitions.pxd b/tables/definitions.pxd
-index 61d75cb..0dce74c 100644
---- a/tables/definitions.pxd
-+++ b/tables/definitions.pxd
-@@ -40,16 +40,16 @@ cdef extern from "numpy/arrayobject.h":
- # Structs and types from HDF5
- cdef extern from "hdf5.h" nogil:
-
-- ctypedef int hid_t # In H5Ipublic.h
-+ ctypedef long long hid_t # In H5Ipublic.h
- ctypedef int hbool_t
- ctypedef int herr_t
- ctypedef int htri_t
- # hsize_t should be unsigned, but Windows platform does not support
- # such an unsigned long long type.
-- ctypedef long long hsize_t
-+ ctypedef unsigned long long hsize_t
- ctypedef signed long long hssize_t
- ctypedef long long int64_t
-- ctypedef long long haddr_t
-+ ctypedef unsigned long long haddr_t
- ctypedef haddr_t hobj_ref_t
-
- ctypedef struct hvl_t:
-@@ -172,61 +172,58 @@ cdef extern from "hdf5.h" nogil:
- H5T_NCLASSES # this must be last
-
- # Native types
-- cdef enum:
-- H5T_C_S1
-- H5T_NATIVE_B8
-- H5T_NATIVE_CHAR
-- H5T_NATIVE_SCHAR
-- H5T_NATIVE_UCHAR
-- H5T_NATIVE_SHORT
-- H5T_NATIVE_USHORT
-- H5T_NATIVE_INT
-- H5T_NATIVE_UINT
-- H5T_NATIVE_LONG
-- H5T_NATIVE_ULONG
-- H5T_NATIVE_LLONG
-- H5T_NATIVE_ULLONG
-- H5T_NATIVE_FLOAT
-- H5T_NATIVE_DOUBLE
-- H5T_NATIVE_LDOUBLE
-+ hid_t H5T_C_S1
-+ hid_t H5T_NATIVE_B8
-+ hid_t H5T_NATIVE_CHAR
-+ hid_t H5T_NATIVE_SCHAR
-+ hid_t H5T_NATIVE_UCHAR
-+ hid_t H5T_NATIVE_SHORT
-+ hid_t H5T_NATIVE_USHORT
-+ hid_t H5T_NATIVE_INT
-+ hid_t H5T_NATIVE_UINT
-+ hid_t H5T_NATIVE_LONG
-+ hid_t H5T_NATIVE_ULONG
-+ hid_t H5T_NATIVE_LLONG
-+ hid_t H5T_NATIVE_ULLONG
-+ hid_t H5T_NATIVE_FLOAT
-+ hid_t H5T_NATIVE_DOUBLE
-+ hid_t H5T_NATIVE_LDOUBLE
-
- # "Standard" types
-- cdef enum:
-- H5T_STD_I8LE
-- H5T_STD_I16LE
-- H5T_STD_I32LE
-- H5T_STD_I64LE
-- H5T_STD_U8LE
-- H5T_STD_U16LE
-- H5T_STD_U32LE
-- H5T_STD_U64LE
-- H5T_STD_B8LE
-- H5T_STD_B16LE
-- H5T_STD_B32LE
-- H5T_STD_B64LE
-- H5T_IEEE_F32LE
-- H5T_IEEE_F64LE
-- H5T_STD_I8BE
-- H5T_STD_I16BE
-- H5T_STD_I32BE
-- H5T_STD_I64BE
-- H5T_STD_U8BE
-- H5T_STD_U16BE
-- H5T_STD_U32BE
-- H5T_STD_U64BE
-- H5T_STD_B8BE
-- H5T_STD_B16BE
-- H5T_STD_B32BE
-- H5T_STD_B64BE
-- H5T_IEEE_F32BE
-- H5T_IEEE_F64BE
-+ hid_t H5T_STD_I8LE
-+ hid_t H5T_STD_I16LE
-+ hid_t H5T_STD_I32LE
-+ hid_t H5T_STD_I64LE
-+ hid_t H5T_STD_U8LE
-+ hid_t H5T_STD_U16LE
-+ hid_t H5T_STD_U32LE
-+ hid_t H5T_STD_U64LE
-+ hid_t H5T_STD_B8LE
-+ hid_t H5T_STD_B16LE
-+ hid_t H5T_STD_B32LE
-+ hid_t H5T_STD_B64LE
-+ hid_t H5T_IEEE_F32LE
-+ hid_t H5T_IEEE_F64LE
-+ hid_t H5T_STD_I8BE
-+ hid_t H5T_STD_I16BE
-+ hid_t H5T_STD_I32BE
-+ hid_t H5T_STD_I64BE
-+ hid_t H5T_STD_U8BE
-+ hid_t H5T_STD_U16BE
-+ hid_t H5T_STD_U32BE
-+ hid_t H5T_STD_U64BE
-+ hid_t H5T_STD_B8BE
-+ hid_t H5T_STD_B16BE
-+ hid_t H5T_STD_B32BE
-+ hid_t H5T_STD_B64BE
-+ hid_t H5T_IEEE_F32BE
-+ hid_t H5T_IEEE_F64BE
-
- # Types which are particular to UNIX (for Time types)
-- cdef enum:
-- H5T_UNIX_D32LE
-- H5T_UNIX_D64LE
-- H5T_UNIX_D32BE
-- H5T_UNIX_D64BE
-+ hid_t H5T_UNIX_D32LE
-+ hid_t H5T_UNIX_D64LE
-+ hid_t H5T_UNIX_D32BE
-+ hid_t H5T_UNIX_D64BE
-
- # The order to retrieve atomic native datatype
- cdef enum H5T_direction_t:
-diff --git a/tables/hdf5extension.pyx b/tables/hdf5extension.pyx
-index b496db4..b9bd9e8 100644
---- a/tables/hdf5extension.pyx
-+++ b/tables/hdf5extension.pyx
-@@ -1217,6 +1217,10 @@ cdef class Array(Leaf):
- atom_ = atom
- shape = shape[:-len(atom_.shape)]
- self.disk_type_id = atom_to_hdf5_type(atom_, self.byteorder)
-+ if self.disk_type_id < 0:
-+ raise HDF5ExtError(
-+ "Problems creating the %s: invalid disk type ID for atom %s" % (
-+ self.__class__.__name__, atom_))
-
- # Allocate space for the dimension axis info and fill it
- dims = numpy.array(shape, dtype=numpy.intp)
-@@ -1885,6 +1889,10 @@ cdef class VLArray(Leaf):
- # Get the HDF5 type of the *scalar* atom
- scatom = atom.copy(shape=())
- self.base_type_id = atom_to_hdf5_type(scatom, self.byteorder)
-+ if self.base_type_id < 0:
-+ raise HDF5ExtError(
-+ "Problems creating the %s: invalid base type ID for atom %s" % (
-+ self.__class__.__name__, scatom))
-
- # Allocate space for the dimension axis info
- rank = len(atom.shape)
-diff --git a/tables/utilsextension.pyx b/tables/utilsextension.pyx
-index 7d801e0..65889bd 100644
---- a/tables/utilsextension.pyx
-+++ b/tables/utilsextension.pyx
-@@ -1156,6 +1156,7 @@ def enum_to_hdf5(object enum_atom, str byteorder):
-
- def atom_to_hdf5_type(atom, str byteorder):
- cdef hid_t tid = -1
-+ cdef hid_t tid2 = -1
- cdef hsize_t *dims = NULL
- cdef bytes encoded_byteorder
- cdef char *cbyteorder = NULL
diff --git a/debian/patches/0005-Ignore-cpuinfo-on-unsupported-archs.patch b/debian/patches/0005-Ignore-cpuinfo-on-unsupported-archs.patch
deleted file mode 100644
index 1be035e..0000000
--- a/debian/patches/0005-Ignore-cpuinfo-on-unsupported-archs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 1 Nov 2016 08:04:42 +0000
-Subject: Ignore cpuinfo errors
-
----
- setup.py | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index fe2492e..15c170a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -32,8 +32,13 @@ import distutils.spawn
- from setuptools.command.build_ext import build_ext
-
- # For guessing the capabilities of the CPU for C-Blosc
--import cpuinfo
--cpu_info = cpuinfo.get_cpu_info()
-+try:
-+ import cpuinfo
-+ cpu_info = cpuinfo.get_cpu_info()
-+ cpu_flags = cpu_info['flags']
-+except Exception as e:
-+ print('cpuinfo failed, assuming no CPU features:', e)
-+ cpu_flags = []
-
- # The name for the pkg-config utility
- PKG_CONFIG = 'pkg-config'
-@@ -808,7 +813,7 @@ if 'BLOSC' not in optional_libs:
- os.remove(fd.name)
-
- # SSE2
-- if False and ('sse2' in cpu_info['flags']):
-+ if False and ('sse2' in cpu_flags):
- print('SSE2 detected')
- CFLAGS.append('-DSHUFFLE_SSE2_ENABLED')
- if os.name == 'nt':
-@@ -822,7 +827,7 @@ if 'BLOSC' not in optional_libs:
- if 'sse2' in f]
- # AVX2
- # Detection code for AVX2 only works for gcc/clang, not for MSVC yet
-- if False and ('avx2' in cpu_info['flags'] and
-+ if False and ('avx2' in cpu_flags and
- compiler_has_flags(compiler, ["-mavx2"])):
- print('AVX2 detected')
- CFLAGS.append('-DSHUFFLE_AVX2_ENABLED')
diff --git a/debian/patches/0006-allow-for-long-type-in-nextafter.patch b/debian/patches/0006-allow-for-long-type-in-nextafter.patch
deleted file mode 100644
index 6617afc..0000000
--- a/debian/patches/0006-allow-for-long-type-in-nextafter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 3 Dec 2016 19:34:28 +0000
-Subject: allow for long type in nextafter
-
----
- tables/idxutils.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tables/idxutils.py b/tables/idxutils.py
-index 99d85d1..470ea4c 100644
---- a/tables/idxutils.py
-+++ b/tables/idxutils.py
-@@ -13,6 +13,7 @@
- """Utilities to be used mainly by the Index class."""
- from __future__ import absolute_import
-
-+import six
- import sys
- import math
- import numpy
-@@ -471,7 +472,7 @@ def nextafter(x, direction, dtype, itemsize):
- direction."""
-
- assert direction in [-1, 0, +1]
-- assert dtype.kind == "S" or type(x) in (bool, int, float)
-+ assert dtype.kind == "S" or type(x) in (bool, float) + six.integer_types
-
- if direction == 0:
- return x
diff --git a/debian/patches/0007-fix-base-class-order.patch b/debian/patches/0007-fix-base-class-order.patch
deleted file mode 100644
index e426deb..0000000
--- a/debian/patches/0007-fix-base-class-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 089e93e..4af95aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
0001-use-dynamic-lib.patch
0002-Never-use-the-msse2-flag-explicitly.patch
-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-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