[Debian-astro-commits] [python-astropy] 01/02: Ensure NUMPY_LT_1_12 works for beta prerelease.

Ole Streicher olebole at moszumanska.debian.org
Thu Dec 29 09:09:43 UTC 2016


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

olebole pushed a commit to branch debian
in repository python-astropy.

commit e9fd516ca0d08eb6d10109023c4605e5e842c461
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Dec 29 09:52:21 2016 +0100

    Ensure NUMPY_LT_1_12 works for beta prerelease.
---
 ...re-NUMPY_LT_1_12-works-for-beta-prerelease.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch b/debian/patches/Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch
new file mode 100644
index 0000000..5ec5460
--- /dev/null
+++ b/debian/patches/Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch
@@ -0,0 +1,21 @@
+From: Marten van Kerkwijk <mhvk at astro.utoronto.ca>
+Date: Sat, 24 Dec 2016 17:06:08 -0500
+Subject: Ensure NUMPY_LT_1_12 works for beta prerelease.
+
+---
+ astropy/utils/compat/numpycompat.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/astropy/utils/compat/numpycompat.py b/astropy/utils/compat/numpycompat.py
+index fbdd029..bda721f 100644
+--- a/astropy/utils/compat/numpycompat.py
++++ b/astropy/utils/compat/numpycompat.py
+@@ -21,7 +21,7 @@ NUMPY_LT_1_9_1 = not minversion('numpy', '1.9.1')
+ NUMPY_LT_1_10 = not minversion('numpy', '1.10.0')
+ NUMPY_LT_1_10_4 = not minversion('numpy', '1.10.4')
+ NUMPY_LT_1_11 = not minversion('numpy', '1.11.0')
+-NUMPY_LT_1_12 = not minversion('numpy', '1.12dev')
++NUMPY_LT_1_12 = not minversion('numpy', '1.12')
+ 
+ 
+ def _monkeypatch_unicode_mask_fill_values():
diff --git a/debian/patches/series b/debian/patches/series
index a06b933..878c3c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable_helper.patch
 fix_for_cfitsio_3380.patch
 only_python3-binaries.patch
 mark_known_failures.patch
+Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git



More information about the Debian-astro-commits mailing list