[Python-modules-commits] [python-numpy] 09/15: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Jan 31 02:06:09 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 369b1e43f5d9007d5f823002ea7f406d8e7b924a
Merge: c6929dc f26d404
Author: Sandro Tosi <morph at debian.org>
Date: Sat Jan 30 13:12:48 2016 +0000
merge patched into master
BENTO_BUILD.txt | 22 -
COMPATIBILITY | 59 -
DEV_README.txt | 18 -
INSTALL.rst.txt | 155 +
INSTALL.txt | 168 -
LICENSE.txt | 2 +-
MANIFEST.in | 3 +-
PKG-INFO | 2 +-
README.txt | 22 -
debian/.git-dpm | 6 +-
.../0005-Dont-fail-if-we-cant-import-mingw32.patch | 4 +-
...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 | 4 +-
debian/patches/python3-soabi.patch | 6 +-
doc/Makefile | 2 +-
doc/release/1.10.0-notes.rst | 16 +-
doc/release/1.10.4-notes.rst | 2 +-
doc/release/1.11.0-notes.rst | 343 +
doc/source/dev/development_environment.rst | 24 +-
doc/source/dev/governance/governance.rst | 400 +
doc/source/dev/governance/index.rst | 9 +
doc/source/dev/governance/people.rst | 55 +
doc/source/dev/index.rst | 1 +
doc/source/reference/arrays.classes.rst | 18 +-
doc/source/reference/arrays.datetime.rst | 62 +-
doc/source/reference/arrays.dtypes.rst | 2 +
doc/source/reference/arrays.indexing.rst | 2 +-
doc/source/reference/arrays.interface.rst | 4 +-
doc/source/reference/arrays.ndarray.rst | 4 +-
doc/source/reference/c-api.array.rst | 18 +-
.../reference/c-api.types-and-structures.rst | 7 +-
doc/source/reference/c-api.ufunc.rst | 11 +-
.../reference/routines.array-manipulation.rst | 1 +
doc/source/reference/routines.indexing.rst | 1 +
doc/source/reference/routines.other.rst | 16 +
doc/source/reference/routines.rst | 2 +
doc/source/reference/swig.interface-file.rst | 2 +-
doc/source/reference/ufuncs.rst | 4 +-
doc/source/release.rst | 1 +
doc/source/user/basics.io.genfromtxt.rst | 22 +-
doc/source/user/basics.rst | 2 +-
doc/source/user/{install.rst => building.rst} | 71 +-
doc/source/user/c-info.ufunc-tutorial.rst | 7 +-
doc/source/user/howtofind.rst | 7 -
doc/source/user/index.rst | 22 +-
doc/source/user/install.rst | 198 +-
doc/source/user/introduction.rst | 10 -
doc/source/user/misc.rst | 2 -
doc/source/user/numpy-for-matlab-users.rst | 746 +
doc/source/user/performance.rst | 5 -
doc/source/user/quickstart.rst | 1414 +
doc/source/user/setting-up.rst | 9 +
numpy/__init__.py | 6 +-
numpy/_build_utils/waf.py | 531 -
numpy/add_newdocs.py | 107 +-
numpy/core/__init__.py | 6 +-
numpy/core/_internal.py | 8 +
numpy/core/arrayprint.py | 22 +-
numpy/core/code_generators/cversions.txt | 1 +
numpy/core/code_generators/genapi.py | 16 +-
numpy/core/code_generators/generate_numpy_api.py | 10 +-
numpy/core/code_generators/generate_ufunc_api.py | 4 -
numpy/core/code_generators/generate_umath.py | 2 +-
numpy/core/code_generators/ufunc_docstrings.py | 16 +-
numpy/core/fromnumeric.py | 105 +-
numpy/core/function_base.py | 2 +-
numpy/core/include/numpy/_numpyconfig.h.in | 1 -
numpy/core/include/numpy/ndarraytypes.h | 6 +-
numpy/core/include/numpy/npy_3kcompat.h | 60 +-
numpy/core/include/numpy/npy_common.h | 18 +
numpy/core/include/numpy/npy_math.h | 4 +-
numpy/core/include/numpy/numpyconfig.h | 1 +
numpy/core/include/numpy/ufuncobject.h | 30 +-
numpy/core/numeric.py | 136 +-
numpy/core/numerictypes.py | 2 +-
numpy/core/records.py | 8 +-
numpy/core/setup.py | 43 +-
numpy/core/setup_common.py | 8 +-
numpy/core/shape_base.py | 2 +-
numpy/core/src/multiarray/_datetime.h | 5 -
numpy/core/src/multiarray/array_assign.c | 27 +-
numpy/core/src/multiarray/arrayobject.c | 1 +
numpy/core/src/multiarray/arraytypes.c.src | 165 +-
numpy/core/src/multiarray/arraytypes.h | 2 -
numpy/core/src/multiarray/buffer.h | 4 -
numpy/core/src/multiarray/cblasfuncs.c | 254 +-
numpy/core/src/multiarray/cblasfuncs.h | 3 -
numpy/core/src/multiarray/common.c | 33 -
numpy/core/src/multiarray/common.h | 5 -
numpy/core/src/multiarray/conversion_utils.c | 115 +-
numpy/core/src/multiarray/conversion_utils.h | 4 -
numpy/core/src/multiarray/convert.c | 45 +-
numpy/core/src/multiarray/ctors.c | 51 +-
numpy/core/src/multiarray/datetime.c | 54 +-
numpy/core/src/multiarray/datetime_busday.c | 1 +
numpy/core/src/multiarray/datetime_busdaycal.h | 4 -
numpy/core/src/multiarray/datetime_strings.c | 228 +-
numpy/core/src/multiarray/datetime_strings.h | 7 +-
numpy/core/src/multiarray/descriptor.c | 10 +-
numpy/core/src/multiarray/descriptor.h | 2 -
numpy/core/src/multiarray/dtype_transfer.c | 6 +-
numpy/core/src/multiarray/getset.c | 1 +
numpy/core/src/multiarray/getset.h | 2 -
numpy/core/src/multiarray/item_selection.c | 31 +-
numpy/core/src/multiarray/iterators.c | 16 +-
numpy/core/src/multiarray/mapping.c | 130 +-
numpy/core/src/multiarray/mapping.h | 4 -
numpy/core/src/multiarray/methods.h | 2 -
numpy/core/src/multiarray/multiarray_tests.c.src | 651 +-
numpy/core/src/multiarray/multiarraymodule.c | 270 +-
numpy/core/src/multiarray/number.c | 13 +-
numpy/core/src/multiarray/number.h | 5 -
numpy/core/src/multiarray/numpyos.c | 152 +-
numpy/core/src/multiarray/numpyos.h | 6 +
numpy/core/src/multiarray/scalartypes.c.src | 24 +-
numpy/core/src/multiarray/scalartypes.h | 13 -
numpy/core/src/multiarray/sequence.h | 4 -
numpy/core/src/multiarray/usertypes.h | 4 -
numpy/core/src/npymath/npy_math.c.src | 15 +-
numpy/core/src/private/mem_overlap.c | 918 +
numpy/core/src/private/mem_overlap.h | 50 +
numpy/core/src/private/npy_config.h | 25 +-
numpy/core/src/private/npy_extint128.h | 317 +
numpy/core/src/private/ufunc_override.h | 47 +-
numpy/core/src/umath/loops.c.src | 148 +-
numpy/core/src/umath/reduction.c | 2 -
numpy/core/src/umath/scalarmath.c.src | 58 +-
numpy/core/src/umath/simd.inc.src | 166 +-
numpy/core/src/umath/ufunc_object.c | 33 +-
numpy/core/src/umath/ufunc_type_resolution.c | 2 -
numpy/core/src/umath/umathmodule.c | 3 -
numpy/core/tests/test_datetime.py | 431 +-
numpy/core/tests/test_defchararray.py | 10 +-
numpy/core/tests/test_deprecations.py | 327 +-
numpy/core/tests/test_dtype.py | 15 +-
numpy/core/tests/test_extint128.py | 225 +
numpy/core/tests/test_indexing.py | 248 +-
numpy/core/tests/test_item_selection.py | 7 +-
numpy/core/tests/test_longdouble.py | 209 +
numpy/core/tests/test_mem_overlap.py | 522 +
numpy/core/tests/test_memmap.py | 12 +-
numpy/core/tests/test_multiarray.py | 710 +-
numpy/core/tests/test_multiarray_assignment.py | 84 -
numpy/core/tests/test_numeric.py | 444 +-
numpy/core/tests/test_print.py | 8 +-
numpy/core/tests/test_scalarinherit.py | 12 +-
numpy/core/tests/test_scalarmath.py | 94 +-
numpy/core/tests/test_shape_base.py | 4 +-
numpy/core/tests/test_ufunc.py | 6 +-
numpy/core/tests/test_umath.py | 37 +-
numpy/ctypeslib.py | 27 +
numpy/distutils/__init__.py | 14 +-
numpy/distutils/ccompiler.py | 8 +-
numpy/distutils/command/build_src.py | 47 +-
numpy/distutils/command/egg_info.py | 8 +
numpy/distutils/fcompiler/intel.py | 8 +-
numpy/distutils/mingw32ccompiler.py | 4 +-
numpy/distutils/misc_util.py | 3 +-
numpy/distutils/npy_pkg_config.py | 5 +-
numpy/distutils/system_info.py | 53 +-
numpy/distutils/tests/f2py_ext/__init__.py | 1 -
numpy/distutils/tests/f2py_ext/setup.py | 13 -
numpy/distutils/tests/f2py_ext/src/fib1.f | 18 -
numpy/distutils/tests/f2py_ext/src/fib2.pyf | 9 -
numpy/distutils/tests/f2py_ext/tests/test_fib2.py | 12 -
numpy/distutils/tests/f2py_f90_ext/__init__.py | 1 -
.../distutils/tests/f2py_f90_ext/include/body.f90 | 5 -
numpy/distutils/tests/f2py_f90_ext/setup.py | 18 -
.../distutils/tests/f2py_f90_ext/src/foo_free.f90 | 6 -
.../distutils/tests/f2py_f90_ext/tests/test_foo.py | 11 -
numpy/distutils/tests/gen_ext/__init__.py | 1 -
numpy/distutils/tests/gen_ext/setup.py | 48 -
numpy/distutils/tests/gen_ext/tests/test_fib3.py | 11 -
numpy/distutils/tests/pyrex_ext/__init__.py | 1 -
numpy/distutils/tests/pyrex_ext/primes.pyx | 22 -
numpy/distutils/tests/pyrex_ext/setup.py | 14 -
.../distutils/tests/pyrex_ext/tests/test_primes.py | 13 -
numpy/distutils/tests/setup.py | 16 -
numpy/distutils/tests/swig_ext/__init__.py | 1 -
numpy/distutils/tests/swig_ext/setup.py | 20 -
numpy/distutils/tests/swig_ext/src/example.c | 14 -
numpy/distutils/tests/swig_ext/src/example.i | 14 -
numpy/distutils/tests/swig_ext/src/zoo.cc | 23 -
numpy/distutils/tests/swig_ext/src/zoo.h | 9 -
numpy/distutils/tests/swig_ext/src/zoo.i | 10 -
.../distutils/tests/swig_ext/tests/test_example.py | 17 -
.../tests/swig_ext/tests/test_example2.py | 15 -
numpy/distutils/tests/test_npy_pkg_config.py | 54 +-
numpy/distutils/tests/test_system_info.py | 17 +-
numpy/doc/basics.py | 39 +
numpy/doc/glossary.py | 6 +-
numpy/doc/howtofind.py | 10 -
numpy/doc/io.py | 10 -
numpy/doc/jargon.py | 10 -
numpy/doc/methods_vs_functions.py | 10 -
numpy/doc/misc.py | 10 +-
numpy/doc/performance.py | 10 -
numpy/doc/structured_arrays.py | 2 +-
numpy/doc/subclassing.py | 36 +-
numpy/f2py/__init__.py | 42 +-
numpy/f2py/auxfuncs.py | 4 -
numpy/f2py/capi_maps.py | 6 +-
numpy/f2py/f90mod_rules.py | 2 +-
numpy/f2py/tests/test_array_from_pyobj.py | 6 +-
numpy/f2py/tests/util.py | 39 +-
numpy/fft/__init__.py | 6 +-
numpy/fft/fftpack.py | 20 +-
numpy/fft/info.py | 2 +-
numpy/lib/__init__.py | 8 +-
numpy/lib/_iotools.py | 13 +
numpy/lib/arraypad.py | 5 +-
numpy/lib/arrayterator.py | 11 +-
numpy/lib/financial.py | 4 +-
numpy/lib/format.py | 3 +-
numpy/lib/function_base.py | 306 +-
numpy/lib/index_tricks.py | 6 +-
numpy/lib/info.py | 6 +
numpy/lib/nanfunctions.py | 11 +-
numpy/lib/npyio.py | 15 +-
numpy/lib/polynomial.py | 27 +-
numpy/lib/shape_base.py | 21 +-
numpy/lib/stride_tricks.py | 3 -
numpy/lib/tests/test__datasource.py | 8 +-
numpy/lib/tests/test_arraypad.py | 2 +-
numpy/lib/tests/test_format.py | 5 +-
numpy/lib/tests/test_function_base.py | 205 +-
numpy/lib/tests/test_io.py | 142 +-
numpy/lib/tests/test_nanfunctions.py | 33 +-
numpy/lib/tests/test_regression.py | 4 -
numpy/lib/tests/test_shape_base.py | 25 +-
numpy/lib/twodim_base.py | 2 +-
numpy/lib/type_check.py | 2 +-
numpy/linalg/__init__.py | 6 +-
numpy/linalg/linalg.py | 25 +-
numpy/linalg/setup.py | 41 +-
numpy/linalg/tests/test_linalg.py | 100 +-
numpy/ma/__init__.py | 6 +-
numpy/ma/core.py | 310 +-
numpy/ma/extras.py | 57 +-
numpy/ma/tests/test_core.py | 175 +-
numpy/ma/tests/test_extras.py | 20 +
numpy/ma/tests/test_mrecords.py | 16 +-
numpy/ma/tests/test_old_ma.py | 58 -
numpy/matrixlib/__init__.py | 6 +-
numpy/matrixlib/defmatrix.py | 28 +-
numpy/polynomial/__init__.py | 6 +-
numpy/polynomial/_polybase.py | 7 +-
numpy/polynomial/chebyshev.py | 34 +-
numpy/polynomial/hermite.py | 35 +-
numpy/polynomial/hermite_e.py | 35 +-
numpy/polynomial/laguerre.py | 34 +-
numpy/polynomial/legendre.py | 42 +-
numpy/polynomial/polynomial.py | 34 +-
numpy/polynomial/tests/test_chebyshev.py | 31 +
numpy/polynomial/tests/test_classes.py | 9 +
numpy/polynomial/tests/test_hermite.py | 31 +
numpy/polynomial/tests/test_hermite_e.py | 31 +
numpy/polynomial/tests/test_laguerre.py | 16 +
numpy/polynomial/tests/test_legendre.py | 31 +
numpy/polynomial/tests/test_polynomial.py | 27 +
numpy/random/__init__.py | 6 +-
numpy/random/mtrand/distributions.c | 5 +-
numpy/random/mtrand/mt_compat.h | 68 +
numpy/random/mtrand/mtrand.c | 42607 +++++++++++--------
numpy/random/mtrand/mtrand.pyx | 499 +-
numpy/random/mtrand/numpy.pxd | 16 +
numpy/random/mtrand/randomkit.c | 224 +-
numpy/random/mtrand/randomkit.h | 41 +-
numpy/random/tests/test_random.py | 159 +-
numpy/setup.py | 1 -
numpy/testing/__init__.py | 2 +-
numpy/testing/decorators.py | 21 +-
numpy/testing/noseclasses.py | 31 +-
numpy/testing/nosetester.py | 60 +-
numpy/testing/tests/test_decorators.py | 20 +-
numpy/testing/tests/test_utils.py | 52 +-
numpy/testing/utils.py | 140 +-
numpy/tests/test_numpy_version.py | 23 +
numpy/tests/test_scripts.py | 7 +-
numpy/version.py | 10 +-
setup.py | 175 +-
setupegg.py | 25 -
tools/swig/numpy.i | 2 +-
tools/swig/test/testFortran.py | 10 -
286 files changed, 37034 insertions(+), 22846 deletions(-)
diff --cc debian/.git-dpm
index cbee581,0000000..840ff72
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
- 937a5d3ded2f608ce116eb02eccdfa3717cd746d
- 937a5d3ded2f608ce116eb02eccdfa3717cd746d
- 7419a239c7ec34d1da12e78cf78d4bff629d3c5e
++f26d404e49597be3be0aad42ff9317354811ca66
++f26d404e49597be3be0aad42ff9317354811ca66
++b5aed68ccb4df09efbda67bf005f88e0fc0d400b
+b5aed68ccb4df09efbda67bf005f88e0fc0d400b
+python-numpy_1.11.0~b2.orig.tar.gz
+ceb6e9b11e72d5a163604cd3328b56062e476e06
+4158319
+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 fff88b0,0000000..68dd949
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 604149bd207b0978553d0a6ce3184c47c622f612 Mon Sep 17 00:00:00 2001
++From f0e699c0f86dceeba5bf8a5f19022bfc1a99ce82 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
++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 f25d924,0000000..2bcaac1
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 937a5d3ded2f608ce116eb02eccdfa3717cd746d Mon Sep 17 00:00:00 2001
++From f26d404e49597be3be0aad42ff9317354811ca66 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 8ec7149,0000000..9b01fc8
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 cd9832c15f8fb7578cdee258677e3410dc34d06d Mon Sep 17 00:00:00 2001
++From 658a6e3f78e0978eba0373af5d37b1d5f9e85c05 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 b1c1ec2,0000000..8916423
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 5305d610c7d0855d1b9e5a3d9b2f4a97c14cd714 Mon Sep 17 00:00:00 2001
++From f6230333bdea2249a6397c1b0e37af538316fb17 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 6965fe5,0000000..1b7fdcb
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 14ec6db8fe474f9461c103e91d05fcf6fb40abdf Mon Sep 17 00:00:00 2001
++From 39934e59bf08feca06ddb93cc70db2a3482771bc 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 04b9489..3b61690 100644
++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 69c2e6b,0000000..9eb6479
mode 100644,000000..100644
--- a/debian/patches/python3-soabi.patch
+++ b/debian/patches/python3-soabi.patch
@@@ -1,48 -1,0 +1,48 @@@
- From b46700642ff9c6d043b1033f66074d84e52a0e3a Mon Sep 17 00:00:00 2001
++From 11c45656ea15c650053c319920d98fae6acc8cad 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 961fa60..bb9f47e 100644
++index fa1dcad..d299e18 100644
+--- a/numpy/ctypeslib.py
++++ b/numpy/ctypeslib.py
- @@ -107,6 +107,14 @@ else:
++@@ -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