[Python-modules-commits] [python-numpy] 15/17: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-numpy.

commit 2da8eae14a9cf1c52e5e73e3a565d0f1181d9f04
Merge: 7aec8b6 604149b
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 10 22:17:47 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0005-Dont-fail-if-we-cant-import-mingw32.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 numpy/core/setup_common.py                         |  5 +++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 4b19673,0000000..682c0d0
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
- 14ec6db8fe474f9461c103e91d05fcf6fb40abdf
- 14ec6db8fe474f9461c103e91d05fcf6fb40abdf
++604149bd207b0978553d0a6ce3184c47c622f612
++604149bd207b0978553d0a6ce3184c47c622f612
 +7419a239c7ec34d1da12e78cf78d4bff629d3c5e
 +7419a239c7ec34d1da12e78cf78d4bff629d3c5e
 +python-numpy_1.10.4.orig.tar.gz
 +2f543ef370d0e801b669feded49ac6baeec8c126
 +4070069
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Dont-fail-if-we-cant-import-mingw32.patch
index 0000000,0000000..fff88b0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Dont-fail-if-we-cant-import-mingw32.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 604149bd207b0978553d0a6ce3184c47c622f612 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sun, 10 Jan 2016 22:16:03 +0000
++Subject: Dont fail if we cant import mingw32
++
++This is required for the Debian version helper, which reads core.setup_common and
++executes it, without using all the Python import machinery. This way we will
++skip the requirement to have the whole numpy module working while we only care
++(at this point) for the API/ABI versions.
++---
++ numpy/core/setup_common.py | 5 ++++-
++ 1 file changed, 4 insertions(+), 1 deletion(-)
++
++diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
++index 253dad5..ec8beba 100644
++--- a/numpy/core/setup_common.py
+++++ b/numpy/core/setup_common.py
++@@ -6,7 +6,10 @@ import warnings
++ import copy
++ import binascii
++ 
++-from numpy.distutils.misc_util import mingw32
+++try:
+++    from numpy.distutils.misc_util import mingw32
+++except:
+++    mingw32 = lambda *args, **kwargs: None
++ 
++ 
++ #-------------------
diff --cc debian/patches/series
index e49adde,0000000..144bd6b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +03_force_f2py_version.patch
 +10_use_local_python.org_object.inv_sphinx.diff
 +python3-soabi.patch
 +adapt_swig_docs_to_debian.patch
++0005-Dont-fail-if-we-cant-import-mingw32.patch

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