[Python-modules-commits] [python-numpy] 09/12: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sat Feb 13 23:48:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-numpy.
commit 98024be2278b923180c7f79d15186775f988ad34
Merge: 3002330 3312e3e
Author: Sandro Tosi <morph at debian.org>
Date: Sat Feb 13 20:37:14 2016 +0000
merge patched into master
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../0005-Dont-fail-if-we-cant-import-mingw32.patch | 2 +-
...erts-on-ppc-with-broken-malloc-only-longd.patch | 2 +-
debian/patches/03_force_f2py_version.patch | 2 +-
.../10_use_local_python.org_object.inv_sphinx.diff | 2 +-
debian/patches/adapt_swig_docs_to_debian.patch | 2 +-
debian/patches/python3-soabi.patch | 2 +-
doc/release/1.11.0-notes.rst | 16 +-
numpy/core/function_base.py | 11 +-
numpy/core/include/numpy/npy_3kcompat.h | 8 +-
numpy/core/src/multiarray/iterators.c | 22 ++-
numpy/core/src/multiarray/methods.c | 2 -
numpy/core/src/private/ufunc_override.h | 6 +
numpy/core/tests/test_function_base.py | 15 +-
numpy/core/tests/test_multiarray.py | 46 +++---
numpy/core/tests/test_umath.py | 25 +++
numpy/distutils/fcompiler/gnu.py | 2 +-
numpy/lib/arraypad.py | 2 +-
numpy/lib/function_base.py | 167 +++++++++++----------
numpy/lib/nanfunctions.py | 162 ++++++++++----------
numpy/lib/tests/test_arraypad.py | 11 ++
numpy/lib/tests/test_function_base.py | 20 ++-
numpy/lib/tests/test_io.py | 2 +-
numpy/lib/tests/test_nanfunctions.py | 5 +-
numpy/ma/core.py | 31 ++--
numpy/ma/tests/test_core.py | 8 -
numpy/tests/test_scripts.py | 26 +++-
numpy/version.py | 8 +-
setup.py | 2 +-
30 files changed, 375 insertions(+), 242 deletions(-)
diff --cc debian/.git-dpm
index 00e4b63,0000000..ef07e21
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
- f26d404e49597be3be0aad42ff9317354811ca66
- f26d404e49597be3be0aad42ff9317354811ca66
- b5aed68ccb4df09efbda67bf005f88e0fc0d400b
++3312e3e132b45f4df91ff70f65e42b309eef22b9
++3312e3e132b45f4df91ff70f65e42b309eef22b9
++e515924842aad6077a213f46a4a514526c4c8f44
+e515924842aad6077a213f46a4a514526c4c8f44
+python-numpy_1.11.0~b3.orig.tar.gz
+513fd8b3935ddaa5ef77e0b0b5e3834317e7d0f3
+4159853
+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 68dd949,0000000..cc97e9c
mode 100644,000000..100644
--- a/debian/patches/0005-Dont-fail-if-we-cant-import-mingw32.patch
+++ b/debian/patches/0005-Dont-fail-if-we-cant-import-mingw32.patch
@@@ -1,29 -1,0 +1,29 @@@
- From f0e699c0f86dceeba5bf8a5f19022bfc1a99ce82 Mon Sep 17 00:00:00 2001
++From b9886721a9246da4c9e1130224e72d827a650160 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 ba7521e..764ad03 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/0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
index 2bcaac1,0000000..1473e74
mode 100644,000000..100644
--- a/debian/patches/0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
+++ b/debian/patches/0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
@@@ -1,29 -1,0 +1,29 @@@
- From f26d404e49597be3be0aad42ff9317354811ca66 Mon Sep 17 00:00:00 2001
++From 3312e3e132b45f4df91ff70f65e42b309eef22b9 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Mon, 11 Jan 2016 23:51:23 +0000
+Subject: disable asserts on ppc with broken malloc only longdouble affected
+ will still work with softfaults
+
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+---
+ numpy/core/src/multiarray/lowlevel_strided_loops.c.src | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
+index 0fe63c1..34e7a74 100644
+--- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
++++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
+@@ -7,6 +7,13 @@
+ *
+ * See LICENSE.txt for the license.
+ */
++#if defined(__powerpc__) & !defined(__powerpc64__)
++#ifndef NDEBUG
++// disable asserts malloc broken
++// https://sourceware.org/bugzilla/show_bug.cgi?id=6527
++#define NDEBUG
++#endif
++#endif
+
+ #define PY_SSIZE_T_CLEAN
+ #include "Python.h"
diff --cc debian/patches/03_force_f2py_version.patch
index 9b01fc8,0000000..1011954
mode 100644,000000..100644
--- a/debian/patches/03_force_f2py_version.patch
+++ b/debian/patches/03_force_f2py_version.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 658a6e3f78e0978eba0373af5d37b1d5f9e85c05 Mon Sep 17 00:00:00 2001
++From df6fd44fff7a39b008f6a9d744b1f8d64bd06f44 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Sun, 11 Oct 2015 10:12:15 -0700
+Subject: force generation f2py postfixed with interpreter version
+
+Patch-Name: 03_force_f2py_version.patch
+---
+ numpy/f2py/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
+index 3204129..0ca45ec 100644
+--- a/numpy/f2py/setup.py
++++ b/numpy/f2py/setup.py
+@@ -55,7 +55,7 @@ def configuration(parent_package='', top_path=None):
+ config.make_svn_version_py()
+
+ def generate_f2py_py(build_dir):
+- f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:]
++ f2py_exe = 'f2py'+sys.version[:3]
+ if f2py_exe[-4:] == '.exe':
+ f2py_exe = f2py_exe[:-4] + '.py'
+ if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
diff --cc debian/patches/10_use_local_python.org_object.inv_sphinx.diff
index 8916423,0000000..9a3d3b5
mode 100644,000000..100644
--- a/debian/patches/10_use_local_python.org_object.inv_sphinx.diff
+++ b/debian/patches/10_use_local_python.org_object.inv_sphinx.diff
@@@ -1,24 -1,0 +1,24 @@@
- From f6230333bdea2249a6397c1b0e37af538316fb17 Mon Sep 17 00:00:00 2001
++From 2120a4f62d8772f66b5381b5de6275afe644ab30 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Sun, 11 Oct 2015 10:12:16 -0700
+Subject: Use a local copy of object.inv from doc.python.org, instead of
+ downloading it each time from the internet
+
+Patch-Name: 10_use_local_python.org_object.inv_sphinx.diff
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 3324982..6ddeafe 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -199,7 +199,7 @@ texinfo_documents = [
+ # -----------------------------------------------------------------------------
+ # Intersphinx configuration
+ # -----------------------------------------------------------------------------
+-intersphinx_mapping = {'http://docs.python.org/dev': None}
++intersphinx_mapping = {'http://docs.python.org/dev': '../../debian/python.org_objects.inv'}
+
+
+ # -----------------------------------------------------------------------------
diff --cc debian/patches/adapt_swig_docs_to_debian.patch
index 1b7fdcb,0000000..542bbf4
mode 100644,000000..100644
--- a/debian/patches/adapt_swig_docs_to_debian.patch
+++ b/debian/patches/adapt_swig_docs_to_debian.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 39934e59bf08feca06ddb93cc70db2a3482771bc Mon Sep 17 00:00:00 2001
++From b677674869f456c386134da541656fd845162b64 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 11 Oct 2015 10:12:18 -0700
+Subject: Adapt SWIG documentation to Debian
+
+ Location of `swig` directory in Debian is specific to our distro, so the
+ documentation needs adaptation.
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-02-08
+Patch-Name: adapt_swig_docs_to_debian.patch
+---
+ doc/source/reference/swig.interface-file.rst | 4 ++--
+ doc/source/reference/swig.testing.rst | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/doc/source/reference/swig.interface-file.rst b/doc/source/reference/swig.interface-file.rst
+index e5d369d..61db829 100644
+--- a/doc/source/reference/swig.interface-file.rst
++++ b/doc/source/reference/swig.interface-file.rst
+@@ -166,8 +166,8 @@ assignments in lines 19 and 20.
+ Using numpy.i
+ -------------
+
+-The ``numpy.i`` file is currently located in the ``tools/swig``
+-sub-directory under the ``numpy`` installation directory. Typically,
++The ``numpy.i`` file is currently located in the ``swig``
++sub-directory in the ``python-numpy-doc`` package directory. Typically,
+ you will want to copy it to the directory where you are developing
+ your wrappers.
+
+diff --git a/doc/source/reference/swig.testing.rst b/doc/source/reference/swig.testing.rst
+index 13642a5..7c9d152 100644
+--- a/doc/source/reference/swig.testing.rst
++++ b/doc/source/reference/swig.testing.rst
+@@ -11,7 +11,8 @@ for a total of 888 typemaps supported "out of the box". Each of these
+ typemaps, in turn, might require several unit tests in order to verify
+ expected behavior for both proper and improper inputs. Currently,
+ this results in more than 1,000 individual unit tests executed when
+-``make test`` is run in the ``numpy/tools/swig`` subdirectory.
++``make test`` is run in the ``swig`` directory of ``python-numpy-doc``
++package.
+
+ To facilitate this many similar unit tests, some high-level
+ programming techniques are employed, including C and `SWIG`_ macros,
diff --cc debian/patches/python3-soabi.patch
index 9eb6479,0000000..360fe48
mode 100644,000000..100644
--- a/debian/patches/python3-soabi.patch
+++ b/debian/patches/python3-soabi.patch
@@@ -1,48 -1,0 +1,48 @@@
- From 11c45656ea15c650053c319920d98fae6acc8cad Mon Sep 17 00:00:00 2001
++From ce7d5bc23f3d91ef1659c8007b42d268168d5c68 Mon Sep 17 00:00:00 2001
+From: Julian Taylor <jtaylor at ubuntu.com>
+Date: Sun, 11 Oct 2015 10:12:17 -0700
+Subject: adapt to python3 multiarch soabi
+
+ python3 soabi contains multiarch but does not export it via SOABI. So hardcode
+ it and disable a test. get_shared_lib_extension can't be properly fixed:
+ doko: we still want this as the default for people building extensions not
+ only for the distribution
+ Nothing in debian uses it to get the python extension.
+Forwarded: not-needed, debian specific
+Patch-Name: python3-soabi.patch
+---
+ numpy/ctypeslib.py | 8 ++++++++
+ numpy/tests/test_ctypeslib.py | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/numpy/ctypeslib.py b/numpy/ctypeslib.py
+index fa1dcad..d299e18 100644
+--- a/numpy/ctypeslib.py
++++ b/numpy/ctypeslib.py
+@@ -134,6 +134,14 @@ else:
+ so_ext2 = get_shared_lib_extension(is_python_ext=True)
+ if not so_ext2 == so_ext:
+ libname_ext.insert(0, libname + so_ext2)
++ try:
++ import sysconfig
++ so_ext3 = '.%s-%s.so' % (sysconfig.get_config_var('SOABI'),
++ sysconfig.get_config_var('MULTIARCH'))
++ libname_ext.insert(0, libname + so_ext3)
++ except (KeyError, ImportError):
++ pass
++
+ else:
+ libname_ext = [libname]
+
+diff --git a/numpy/tests/test_ctypeslib.py b/numpy/tests/test_ctypeslib.py
+index 5e888eb..9e7fc2d 100644
+--- a/numpy/tests/test_ctypeslib.py
++++ b/numpy/tests/test_ctypeslib.py
+@@ -27,6 +27,7 @@ class TestLoadLibrary(TestCase):
+ " (import error was: %s)" % str(e))
+ print(msg)
+
++ @dec.skipif(True, 'Skipped as per debian/patches/python3-soabi.patch')
+ @dec.skipif(not _HAS_CTYPE,
+ "ctypes not available on this python installation")
+ @dec.knownfailureif(sys.platform ==
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-numpy.git
More information about the Python-modules-commits
mailing list