[pytables] 04/14: Refresh all patches
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Tue Nov 1 07:57:30 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 234464a3605d37beaa59aaa450fe47962a05f75e
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Mon Oct 31 08:09:57 2016 +0000
Refresh all patches
---
debian/changelog | 4 +++
debian/control | 1 +
debian/patches/0001-use-dynamic-lib.patch | 6 ++--
.../patches/0002-Use-system-compression-libs.patch | 37 +++++++++++++---------
.../0003-Never-use-the-msse2-flag-explicitly.patch | 35 +++++++++++++-------
.../patches/0005-fix-index-inheritance-order.patch | 21 ------------
.../0006-fix-typo-in-hdf5extension.pyx.patch | 21 ------------
debian/patches/series | 2 --
8 files changed, 53 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4465f9..49096f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ pytables (3.3.0-1) UNRELEASED; urgency=medium
* New upstream release
* debian/watch
- add compatibility to the new tagging schema
+ * debian/patches
+ - refresh all patches
+ - drop 0005-fix-index-inheritance-order.patch and
+ 0006-fix-typo-in-hdf5extension.pyx.patch: applied upstream
-- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 31 Oct 2016 07:42:52 +0000
diff --git a/debian/control b/debian/control
index b549078..effdc46 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 9.0.0),
liblz4-dev (>= 0.0~r122),
libsnappy-dev,
libbz2-dev,
+ libzstd-dev,
python-sphinx,
texlive-generic-extra,
texlive-latex-recommended,
diff --git a/debian/patches/0001-use-dynamic-lib.patch b/debian/patches/0001-use-dynamic-lib.patch
index a840390..85e7e6a 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 2c0c126..27710e3 100755
+index 6b64a57..0d9b408 100755
--- a/setup.py
+++ b/setup.py
-@@ -327,7 +327,7 @@ class Package(object):
+@@ -308,7 +308,7 @@ class Package(object):
class PosixPackage(Package):
_library_prefixes = ['lib']
@@ -25,4 +25,4 @@ index 2c0c126..27710e3 100755
+ _library_suffixes = ['.so', '.dylib'] # , '.a']
_runtime_prefixes = _library_prefixes
_runtime_suffixes = ['.so', '.dylib']
- _component_dirs = ['include', 'lib']
+ _component_dirs = ['include', 'lib', 'lib64']
diff --git a/debian/patches/0002-Use-system-compression-libs.patch b/debian/patches/0002-Use-system-compression-libs.patch
index 27fef0f..7a6d4e3 100644
--- a/debian/patches/0002-Use-system-compression-libs.patch
+++ b/debian/patches/0002-Use-system-compression-libs.patch
@@ -6,30 +6,37 @@ Now Blosc supports different compressors (fastlz, zlib, snappy and lz4).
This patch enables the use of system libraries rather then the internal
copies bundled with blosc itself.
---
- setup.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ setup.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
-index 27710e3..4e016de 100755
+index 0d9b408..d87b893 100755
--- a/setup.py
+++ b/setup.py
-@@ -735,14 +735,15 @@ if 'BLOSC' not in optional_libs:
- # Blosc + BloscLZ sources
- blosc_files += glob.glob('c-blosc/blosc/*.c')
+@@ -780,18 +780,19 @@ if 'BLOSC' not in optional_libs:
+ blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
+ if 'avx2' not in f and 'sse2' not in f]
# LZ4 sources
-- blosc_files += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
-+ #blosc_files += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
+- blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
++ #blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
# Snappy sources
-- blosc_files += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
-+ #blosc_files += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
+- blosc_sources += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
++ #blosc_sources += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
# Zlib sources
-- blosc_files += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
-+ #blosc_files += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
-+ ADDLIBS.extend(['lz4', 'snappy', 'z'])
+- blosc_sources += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
++ #blosc_sources += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
+ # Zstd sources
+- blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
++ #blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
++ ADDLIBS.extend(['lz4', 'snappy', 'zstd', 'z'])
# Finally, add all the include dirs...
inc_dirs += [os.path.join('c-blosc', 'blosc')]
- inc_dirs += glob.glob('c-blosc/internal-complibs/*')
+- inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
+- inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
+ #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
++ #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
++ #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
# ...and the macros for all the compressors supported
- def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1)]
-
+ def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1),
+ ('HAVE_ZSTD', 1)]
diff --git a/debian/patches/0003-Never-use-the-msse2-flag-explicitly.patch b/debian/patches/0003-Never-use-the-msse2-flag-explicitly.patch
index 3fc2ef7..ec9b5db 100644
--- a/debian/patches/0003-Never-use-the-msse2-flag-explicitly.patch
+++ b/debian/patches/0003-Never-use-the-msse2-flag-explicitly.patch
@@ -1,23 +1,34 @@
-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
===================================================================
---
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
-index 4e016de..990e3fe 100755
+index d87b893..a2c79c0 100755
--- a/setup.py
+++ b/setup.py
-@@ -762,7 +762,8 @@ if 'BLOSC' not in optional_libs:
- finally:
+@@ -813,7 +813,7 @@ if 'BLOSC' not in optional_libs:
os.remove(fd.name)
-- 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)
+ # SSE2
+- if 'sse2' in cpu_info['flags']:
++ if false and 'sse2' in cpu_info['flags']:
+ print('SSE2 detected')
+ CFLAGS.append('-DSHUFFLE_SSE2_ENABLED')
+ if os.name == 'nt':
+@@ -827,8 +827,8 @@ 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')
diff --git a/debian/patches/0005-fix-index-inheritance-order.patch b/debian/patches/0005-fix-index-inheritance-order.patch
deleted file mode 100644
index 9e92f92..0000000
--- a/debian/patches/0005-fix-index-inheritance-order.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 26 Mar 2016 08:51:43 +0100
-Subject: fix index inheritance order
-
----
- tables/index.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tables/index.py b/tables/index.py
-index 712f773..2b07f77 100644
---- a/tables/index.py
-+++ b/tables/index.py
-@@ -105,7 +105,7 @@ def _table_column_pathname_of_index(indexpathname):
- _tableColumnPathnameOfIndex = previous_api(_table_column_pathname_of_index)
-
-
--class Index(NotLoggedMixin, indexesextension.Index, Group):
-+class Index(NotLoggedMixin, Group, indexesextension.Index):
- """Represents the index of a column in a table.
-
- This class is used to keep the indexing information for columns in a Table
diff --git a/debian/patches/0006-fix-typo-in-hdf5extension.pyx.patch b/debian/patches/0006-fix-typo-in-hdf5extension.pyx.patch
deleted file mode 100644
index 86c3ae7..0000000
--- a/debian/patches/0006-fix-typo-in-hdf5extension.pyx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 26 Mar 2016 18:12:16 +0000
-Subject: fix typo in hdf5extension.pyx
-
----
- tables/hdf5extension.pyx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tables/hdf5extension.pyx b/tables/hdf5extension.pyx
-index 85c916c..28371b3 100644
---- a/tables/hdf5extension.pyx
-+++ b/tables/hdf5extension.pyx
-@@ -356,7 +356,7 @@ cdef class File:
- elif not PyBytes_Check(image):
- raise TypeError("The DRIVER_CORE_IMAGE must be a string of bytes")
- elif not H5_HAVE_IMAGE_FILE:
-- raise RuntimeError("Support for image files is only availabe in "
-+ raise RuntimeError("Support for image files is only available in "
- "HDF5 >= 1.8.9")
-
- # After the following check we can be quite sure
diff --git a/debian/patches/series b/debian/patches/series
index 1fe3abc..5900800 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@
0002-Use-system-compression-libs.patch
0003-Never-use-the-msse2-flag-explicitly.patch
0004-Do-not-fetch-icons-for-external-web-sites.patch
-0005-fix-index-inheritance-order.patch
-0006-fix-typo-in-hdf5extension.pyx.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