[h5py] 04/17: Initialize git-dpm
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 5 19:13:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository h5py.
commit 0e92ee236daf5ddafe74e8ca929c666ce6d98a2b
Merge: dd8e859 9ad016f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Jan 5 13:58:27 2017 +0000
Initialize git-dpm
debian/.git-dpm | 8 ++++++++
...ble-usage-of-rpath.patch => 0001-Disable-usage-of-rpath.patch} | 1 +
...Disable-broken-tests.patch => 0002-Disable-broken-tests.patch} | 1 +
...ix-Detection.patch => 0003-Package-Config-Fix-Detection.patch} | 1 +
debian/patches/series | 6 +++---
h5py/tests/old/test_file.py | 2 +-
setup_build.py | 4 ++--
setup_configure.py | 2 +-
8 files changed, 18 insertions(+), 7 deletions(-)
diff --cc debian/.git-dpm
index 0000000,0000000..a00227e
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++9ad016f2259285f1844062c46d839697968bf5bd
++9ad016f2259285f1844062c46d839697968bf5bd
++af0f1fef399ddd9c4700eeb74d93a685f2dc89f6
++af0f1fef399ddd9c4700eeb74d93a685f2dc89f6
++h5py_2.6.0.orig.tar.gz
++fb2b687eaa2600f218f5cf24aa67e35c8c91089e
++246443
diff --cc debian/patches/0001-Disable-usage-of-rpath.patch
index 9e3eeb9,0000000..0be5123
mode 100644,000000..100644
--- a/debian/patches/0001-Disable-usage-of-rpath.patch
+++ b/debian/patches/0001-Disable-usage-of-rpath.patch
@@@ -1,23 -1,0 +1,24 @@@
++From 277b060d87ab49dbf990a9b24c31da6f5cc5b853 Mon Sep 17 00:00:00 2001
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 2 Feb 2016 10:56:16 +0000
+Subject: Disable usage of rpath.
+
+---
+ setup_build.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup_build.py b/setup_build.py
+index 6e3468b..05b14a5 100644
+--- a/setup_build.py
++++ b/setup_build.py
+@@ -102,8 +102,8 @@ class h5py_build_ext(build_ext):
+ settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
+
+ # TODO: should this only be done on UNIX?
+- if os.name != 'nt':
+- settings['runtime_library_dirs'] = settings['library_dirs']
++ #if os.name != 'nt':
++ #settings['runtime_library_dirs'] = settings['library_dirs']
+
+ def make_extension(module):
+ sources = [localpath('h5py', module+'.pyx')] + EXTRA_SRC.get(module, [])
diff --cc debian/patches/0002-Disable-broken-tests.patch
index 08edc4c,0000000..da1d1e3
mode 100644,000000..100644
--- a/debian/patches/0002-Disable-broken-tests.patch
+++ b/debian/patches/0002-Disable-broken-tests.patch
@@@ -1,21 -1,0 +1,22 @@@
++From ff3c08dd5306a295eb608d18b17c15bb679f2bcd Mon Sep 17 00:00:00 2001
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 2 Feb 2016 16:22:31 +0000
+Subject: Disable broken tests.
+
+---
+ h5py/tests/old/test_file.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/h5py/tests/old/test_file.py b/h5py/tests/old/test_file.py
+index ff9d19c..39f0ef7 100644
+--- a/h5py/tests/old/test_file.py
++++ b/h5py/tests/old/test_file.py
+@@ -45,7 +45,7 @@ class TestFileOpen(TestCase):
+ try:
+ with File(fname) as f:
+ self.assertTrue(f)
+- self.assertEqual(f.mode, 'r')
++ #self.assertEqual(f.mode, 'r')
+ finally:
+ os.chmod(fname, stat.S_IWRITE)
+
diff --cc debian/patches/0003-Package-Config-Fix-Detection.patch
index 1bc6682,0000000..ca20cff
mode 100644,000000..100644
--- a/debian/patches/0003-Package-Config-Fix-Detection.patch
+++ b/debian/patches/0003-Package-Config-Fix-Detection.patch
@@@ -1,35 -1,0 +1,36 @@@
++From 9ad016f2259285f1844062c46d839697968bf5bd Mon Sep 17 00:00:00 2001
+From: Axel Huebl <axel.huebl at plasma.ninja>
+Date: Wed, 13 Jul 2016 10:02:15 +0200
+Subject: Package Config: Fix Detection
+
+Fix the detection of `pkgconfig` to avoid fallbacks to
+HDF `1.8.4` or non-detection on default installs on Ubuntu/Debian
+based systems.
+
+This is a fixed version of PR #707 by @asford with the feedback
+provided by @andreabedini.
+
+The main problem is the mismatch of `list`
+[append vs. extend](http://stackoverflow.com/questions/252703/append-vs-extend)
+:
+`pkgconfig.parse("hdf5")` returns a dictionary of `set`s of which we
+take the set of `library_dirs` which should be extending the libdirs
+list element-wise (and *not* "adding a `set` object to a list"
+via `append`).
+---
+ setup_configure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup_configure.py b/setup_configure.py
+index fc7fb08..c670ff1 100644
+--- a/setup_configure.py
++++ b/setup_configure.py
+@@ -204,7 +204,7 @@ def autodetect_version(hdf5_dir=None):
+ libdirs = ['/usr/local/lib', '/opt/local/lib']
+ try:
+ if pkgconfig.exists("hdf5"):
+- libdirs.append(pkgconfig.parse("hdf5")['library_dirs'])
++ libdirs.extend(pkgconfig.parse("hdf5")['library_dirs'])
+ except EnvironmentError:
+ pass
+ if hdf5_dir is not None:
diff --cc debian/patches/series
index b66b47c,0000000..da9c7f8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,3 @@@
- Disable-usage-of-rpath.patch
- Disable-broken-tests.patch
- Package-Config-Fix-Detection.patch
++0001-Disable-usage-of-rpath.patch
++0002-Disable-broken-tests.patch
++0003-Package-Config-Fix-Detection.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git
More information about the debian-science-commits
mailing list