[h5py] 08/09: cherry-picked 'af91559b Fix version_tuple to make it PEP440 compliant' into 'patched'

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository h5py.

commit ac3517a93a2a36a67b4aa8316b29e59bd9f5c830
Merge: eedffb0 f5a5140
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 25 14:08:52 2017 +0000

    cherry-picked 'af91559b Fix version_tuple to make it PEP440 compliant' into 'patched'

 debian/.git-dpm                                    |  4 +-
 ...version_tuple-to-make-it-PEP440-compliant.patch | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 h5py/version.py                                    | 18 +++++---
 4 files changed, 65 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 5c69ce5,0000000..d530283
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9607212a1a3999edf25bccddb7ddf52e1c67ece3
- 9607212a1a3999edf25bccddb7ddf52e1c67ece3
++f5a5140861f88fc7086c81ea2d16812ac71a84fa
++f5a5140861f88fc7086c81ea2d16812ac71a84fa
 +307ed5838b3a194864ed984f312c2f43315f18d4
 +307ed5838b3a194864ed984f312c2f43315f18d4
 +h5py_2.7.0~rc3.orig.tar.gz
 +9098edc50d89b086999c3e7a984a91266aa6a5ee
 +265017
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Fix-version_tuple-to-make-it-PEP440-compliant.patch
index 0000000,0000000..4061a96
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Fix-version_tuple-to-make-it-PEP440-compliant.patch
@@@ -1,0 -1,0 +1,49 @@@
++From f5a5140861f88fc7086c81ea2d16812ac71a84fa Mon Sep 17 00:00:00 2001
++From: James Tocknell <aragilar at gmail.com>
++Date: Wed, 25 Jan 2017 22:27:46 +1100
++Subject: Fix version_tuple to make it PEP440 compliant
++
++---
++ h5py/version.py | 18 +++++++++++++-----
++ 1 file changed, 13 insertions(+), 5 deletions(-)
++
++diff --git a/h5py/version.py b/h5py/version.py
++index f5c3287..066b921 100644
++--- a/h5py/version.py
+++++ b/h5py/version.py
++@@ -13,22 +13,30 @@
++ 
++ from __future__ import absolute_import
++ 
+++from collections import namedtuple
++ from . import h5 as _h5
++-from distutils.version import StrictVersion as _sv
++ import sys
++ import numpy
++ 
++-version = "2.7.0rc3"
+++# All should be integers, except pre, as validating versions is more than is
+++# needed for our use case
+++_H5PY_VERSION_CLS = namedtuple("_H5PY_VERSION_CLS", "major minor bugfix pre post dev")
++ 
++-_exp = _sv(version)
+++version_tuple = _H5PY_VERSION_CLS(2, 7, 0, "rc3", None, None)
++ 
++-version_tuple = _exp.version + ((''.join(str(x) for x in _exp.prerelease),) if _exp.prerelease is not None else ('',))
+++version = "{0.major:d}.{0.minor:d}.{0.bugfix:d}".format(version_tuple)
+++if version_tuple.pre is not None:
+++    version += version_tuple.pre
+++if version_tuple.post is not None:
+++    version += ".post{0.post:d}".format(version_tuple)
+++if version_tuple.dev is not None:
+++    version += ".dev{0.dev:d}".format(version_tuple)
++ 
++ hdf5_version_tuple = _h5.get_libversion()
++ hdf5_version = "%d.%d.%d" % hdf5_version_tuple
++ 
++ api_version_tuple = (1,8)
++-api_version = "1.8"
+++api_version = "%d.%d" % api_version_tuple
++ 
++ info = """\
++ Summary of the h5py configuration
diff --cc debian/patches/series
index 243ee7e,0000000..73882c2
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Disable-usage-of-rpath.patch
 +0002-Fix-arch-name-for-ppc64le.patch
++0003-Fix-version_tuple-to-make-it-PEP440-compliant.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git