[SCM] Packaging for pytables branch, master, updated. debian/2.3.1-3-7-gf3c3c73
Antonio Valentino
antonio.valentino at tiscali.it
Mon Jul 30 21:15:18 UTC 2012
The following commit has been merged in the master branch:
commit 2e768e7bf6316e19eef4d6e8d397d42c7b4c8c35
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Mon Jul 30 21:18:41 2012 +0200
Removed all patches (applied upstream)
diff --git a/debian/changelog b/debian/changelog
index 4edc65d..ef568f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ pytables (2.4.0) UNRELEASED; urgency=low
* New upstream release
* Improved watch file
+ * Removed all patches (applied upstream)
- -- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 30 Jul 2012 19:01:33 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 30 Jul 2012 21:17:28 +0200
pytables (2.3.1-3) unstable; urgency=low
diff --git a/debian/patches/disable_blosc.patch b/debian/patches/disable_blosc.patch
deleted file mode 100644
index bb55980..0000000
--- a/debian/patches/disable_blosc.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: disable blosc on arm
- blosc compression is not functional due to the reliance on unaligned
- memory access. This patch replaces all blosc write functionality with
- zlib (default fallback) and disables a test reading blosc compressed data.
- One could also disable reading by removing it from all_complibs in
- tables/filters.py but that would require fixing up all tests to expect
- exceptions.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661286
-Bug: https://github.com/FrancescAlted/blosc/issues/3
-Author: Julian Taylor <jtaylor at ubuntu.com>
---- a/tables/utilsExtension.pyx
-+++ b/tables/utilsExtension.pyx
-@@ -361,6 +361,14 @@
-
- libnames = ('hdf5', 'zlib', 'lzo', 'bzip2', 'blosc')
-
-+ def _arch_without_blosc():
-+ import platform
-+ arch = platform.machine().lower()
-+ for a in ["arm", "sparc", "mips"]:
-+ if a in arch:
-+ return True
-+ return False
-+
- if strcmp(name, "hdf5") == 0:
- binver, strver = getHDF5VersionInfo()
- return (binver, strver, None) # Should be always available
-@@ -376,7 +384,8 @@
- (bzip2_version_string, bzip2_version_date) = bzip2_version
- return (bzip2_version, bzip2_version_string, bzip2_version_date)
- elif strcmp(name, "blosc") == 0:
-- return (blosc_version, blosc_version_string, blosc_version_date)
-+ if not _arch_without_blosc():
-+ return (blosc_version, blosc_version_string, blosc_version_date)
- else:
- raise ValueError("""\
- asked version of unsupported library ``%s``; \
---- a/tables/tests/test_all.py
-+++ b/tables/tests/test_all.py
-@@ -15,7 +15,13 @@
- from tables.tests import common
- from tables.utils import detectNumberOfCores
-
--
-+def _arch_without_blosc():
-+ import platform
-+ arch = platform.machine().lower()
-+ for a in ["arm", "sparc", "mips"]:
-+ if a in arch:
-+ return True
-+ return False
-
- def get_tuple_version(hexversion):
- """Get a tuple from a compact version in hex."""
-@@ -133,9 +139,10 @@
- if tinfo is not None:
- print "BZIP2 version: %s (%s)" % (tinfo[1], tinfo[2])
- tinfo = tables.whichLibVersion("blosc")
-- blosc_date = tinfo[2].split()[1]
-- if tinfo is not None:
-- print "Blosc version: %s (%s)" % (tinfo[1], blosc_date)
-+ if not _arch_without_blosc():
-+ blosc_date = tinfo[2].split()[1]
-+ if tinfo is not None:
-+ print "Blosc version: %s (%s)" % (tinfo[1], blosc_date)
- try:
- from Cython.Compiler.Main import Version as Cython_Version
- print 'Cython version: %s' % Cython_Version.version
---- a/tables/tests/test_basics.py
-+++ b/tables/tests/test_basics.py
-@@ -2343,7 +2343,7 @@
- theSuite.addTest(unittest.makeSuite(PythonAttrsTestCase))
- theSuite.addTest(unittest.makeSuite(StateTestCase))
- theSuite.addTest(unittest.makeSuite(FlavorTestCase))
-- theSuite.addTest(unittest.makeSuite(BloscBigEndian))
-+ #theSuite.addTest(unittest.makeSuite(BloscBigEndian))
- theSuite.addTest(unittest.makeSuite(BloscSubprocess))
-
- return theSuite
diff --git a/debian/patches/fix_library_detection.patch b/debian/patches/fix_library_detection.patch
deleted file mode 100644
index 26441ac..0000000
--- a/debian/patches/fix_library_detection.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 19 Feb 2012 18:26:25 +0100
-Subject: Fix the detection of multiarched libraries
-
-Origin: https://github.com/avalentino/PyTables/commit/b26297256ed94ee34b65429520fb9adf1686fc04
-Bug: https://github.com/PyTables/PyTables/issues/124
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657789
-Forwarded: yes
-
----
- setup.py | 37 ++++++++++++++++++++++++++++---------
- 1 file changed, 28 insertions(+), 9 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -21,6 +21,7 @@
- from distutils.core import Extension
- from distutils.dep_util import newer
- from distutils.util import convert_path
-+from distutils.ccompiler import new_compiler
-
- # The minimum required versions
- # (keep these in sync with tables.req_versions and user's guide and README)
-@@ -241,12 +242,14 @@
-
- _component_dirs = ['include', 'lib']
-
-- def __init__(self, name, tag, header_name, library_name):
-+ def __init__(self, name, tag, header_name, library_name,
-+ target_function=None):
- self.name = name
- self.tag = tag
- self.header_name = header_name
- self.library_name = library_name
- self.runtime_name = library_name
-+ self.target_function = target_function
-
- class WindowsPackage(Package):
- _library_prefixes = ['']
-@@ -257,12 +260,14 @@
- # lookup in '.' seems necessary for LZO2
- _component_dirs = ['include', 'lib', 'dll', '.']
-
-- def __init__(self, name, tag, header_name, library_name, runtime_name):
-+ def __init__(self, name, tag, header_name, library_name, runtime_name,
-+ target_function=None):
- self.name = name
- self.tag = tag
- self.header_name = header_name
- self.library_name = library_name
- self.runtime_name = runtime_name
-+ self.target_function = target_function
-
- def find_runtime_path(self, locations=default_runtime_dirs):
- # An explicit path can not be provided for runtime libraries.
-@@ -319,10 +324,14 @@
- if '--debug' in sys.argv:
- _platdep['HDF5'] = ['hdf5ddll', 'hdf5ddll']
-
--hdf5_package = _Package("HDF5", 'HDF5', 'H5public', *_platdep['HDF5'])
--lzo2_package = _Package("LZO 2", 'LZO2', _cp('lzo/lzo1x'), *_platdep['LZO2'])
--lzo1_package = _Package("LZO 1", 'LZO', 'lzo1x', *_platdep['LZO'])
--bzip2_package = _Package("bzip2", 'BZ2', 'bzlib', *_platdep['BZ2'])
-+hdf5_package = _Package("HDF5", 'HDF5', 'H5public', *_platdep['HDF5'],
-+ target_function='H5close')
-+lzo2_package = _Package("LZO 2", 'LZO2', _cp('lzo/lzo1x'), *_platdep['LZO2'],
-+ target_function='lzo_version_date')
-+lzo1_package = _Package("LZO 1", 'LZO', 'lzo1x', *_platdep['LZO'],
-+ target_function='lzo_version_date')
-+bzip2_package = _Package("bzip2", 'BZ2', 'bzlib', *_platdep['BZ2'],
-+ target_function='BZ2_bzlibVersion')
-
-
- #-----------------------------------------------------------------
-@@ -383,6 +392,7 @@
-
- # Try to locate the compulsory and optional libraries.
- lzo2_enabled = False
-+c = new_compiler()
- for (package, location) in [
- (hdf5_package, HDF5_DIR),
- (lzo2_package, LZO_DIR),
-@@ -397,6 +407,11 @@
-
- (hdrdir, libdir, rundir) = package.find_directories(location)
-
-+ # check if the library is in the standard compiler paths
-+ if not libdir:
-+ libdir = c.has_function(package.target_function,
-+ libraries=(package.library_name,))
-+
- if not (hdrdir and libdir):
- if package.tag in ['HDF5']: # these are compulsory!
- pname, ptag = package.name, package.tag
-@@ -411,8 +426,12 @@
- "disabling support for it." % package.name)
- continue # look for the next library
-
-- print ( "* Found %s headers at ``%s``, library at ``%s``."
-- % (package.name, hdrdir, libdir) )
-+ if libdir in ("", True):
-+ print ( "* Found %s headers at ``%s``, the library is located in the "
-+ "standard system search dirs." % (package.name, hdrdir) )
-+ else:
-+ print ( "* Found %s headers at ``%s``, library at ``%s``."
-+ % (package.name, hdrdir, libdir) )
-
- if package.tag in ['HDF5']:
- hdf5_header = os.path.join(hdrdir, "H5public.h")
-@@ -423,7 +442,7 @@
-
- if hdrdir not in default_header_dirs:
- inc_dirs.append(hdrdir) # save header directory if needed
-- if libdir not in default_library_dirs:
-+ if libdir not in default_library_dirs and libdir not in ("", True):
- # save library directory if needed
- if os.name == "nt":
- # Important to quote the libdir for Windows (Vista) systems
diff --git a/debian/patches/fix_unaligned_mem_access b/debian/patches/fix_unaligned_mem_access
deleted file mode 100644
index 35da911..0000000
--- a/debian/patches/fix_unaligned_mem_access
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix errors related to unaligned memory access.
-
-Perform an explicit copy of data to avoid errors related to
-unaligned memory access on platforms like ARM, etc.
-
---- a/src/typeconv.c
-+++ b/src/typeconv.c
-@@ -66,25 +66,24 @@
-
- for (record = 0; record < nrecords; record++) {
- for (element = 0; element < nelements; element++) {
-+ double fb;
-+ memcpy(&fb, fieldbase, sizeof(*fieldbase));
- if (sense == 0) {
-- /* Convert from float64 to timeval32. */
-- tv.i64 = (((PY_LONG_LONG)(*fieldbase) << 32)
-- | (lround((*fieldbase - (int)(*fieldbase)) * 1e+6)
-- & 0x0ffffffff));
-- *fieldbase = tv.f64;
-+ /* Convert from float64 to timeval32. */
-+ tv.i64 = (((PY_LONG_LONG)(fb) << 32)
-+ | (lround((fb - (int)(fb)) * 1e+6) & 0x0ffffffff));
-+ fb = tv.f64;
- } else {
-- /* Convert from timeval32 to float64. */
-- tv.f64 = *fieldbase;
-- /* the next computation is 64 bit-platforms aware */
-- *fieldbase = 1e-6 * (int)tv.i64 + (tv.i64 >> 32);
-+ /* Convert from timeval32 to float64. */
-+ tv.f64 = fb;
-+ /* the next computation is 64 bit-platforms aware */
-+ fb = 1e-6 * (int)tv.i64 + (tv.i64 >> 32);
- }
-+ memcpy(fieldbase, &fb, sizeof(*fieldbase));
- fieldbase++;
- }
-
- fieldbase = (double *)((unsigned char *)(fieldbase) + gapsize);
--
-- /* XXX: Need to check if this works on platforms which require
-- 64-bit data to be aligned. ivb(2005-01-07) */
- }
-
- assert(fieldbase == (base + byteoffset + bytestride * nrecords));
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 27e9daf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-up_skip_multiprocessing_test_on_gnu
-fix_unaligned_mem_access
-fix_library_detection.patch
-disable_blosc.patch
-
diff --git a/debian/patches/up_skip_multiprocessing_test_on_gnu b/debian/patches/up_skip_multiprocessing_test_on_gnu
deleted file mode 100644
index b3c2ad2..0000000
--- a/debian/patches/up_skip_multiprocessing_test_on_gnu
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Yaroslav Halchenko <debian at onerussian.com>
-Subject: Skip the unittest on kFreeBSD and Hurd -- locking seems to be N/A
-
- on kfreebsd /dev/shm is N/A
- on Hurd -- inter-process semaphore locking is N/A
-
-Vendor: Debian
-
---- a/tables/tests/test_basics.py
-+++ b/tables/tests/test_basics.py
-@@ -2294,6 +2294,11 @@ def _worker(fn, qout = None):
- class BloscSubprocess(common.PyTablesTestCase):
- def test_multiprocess(self):
- import multiprocessing as mp
-+ import platform as pl
-+
-+ if pl.system().lower() in ('gnu', 'gnu/kfreebsd'):
-+ raise common.SkipTest(
-+ "multiprocessing module is not supported on Hurd/kFreeBSD")
-
- # Create a relatively large table with Blosc level 9 (large blocks)
- fn = tempfile.mktemp(prefix="multiproc-blosc9-", suffix=".h5")
--
Packaging for pytables
More information about the debian-science-commits
mailing list