[Python-modules-commits] [python-numpy] 09/11: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Aug 20 20:21:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-numpy.
commit f51be4e7ee95f8d49cd1eca1bcd705d597c72585
Merge: 7697978 214c56a
Author: Sandro Tosi <morph at debian.org>
Date: Sat Aug 19 21:42:46 2017 -0400
merge patched into master
LICENSE.txt | 2 +-
PKG-INFO | 7 +-
debian/.git-dpm | 6 +-
.../0005-Dont-fail-if-we-cant-import-mingw32.patch | 4 +-
...erts-on-ppc-with-broken-malloc-only-longd.patch | 4 +-
...Don-t-signal-FP-exceptions-in-np.absolute.patch | 89 -
debian/patches/03_force_f2py_version.patch | 2 +-
.../10_use_local_python.org_object.inv_sphinx.diff | 6 +-
debian/patches/adapt_swig_docs_to_debian.patch | 4 +-
debian/patches/python3-soabi.patch | 2 +-
debian/patches/series | 1 -
doc/f2py/FAQ.txt | 4 +-
doc/f2py/HISTORY.txt | 10 +-
doc/f2py/Makefile | 2 +-
doc/f2py/README.txt | 2 +-
doc/f2py/TESTING.txt | 2 +-
doc/f2py/apps.tex | 2 +-
doc/f2py/bugs.tex | 2 +-
doc/f2py/collectinput.py | 2 +-
doc/f2py/fortranobject.tex | 2 +-
doc/f2py/index.html | 2 +-
doc/f2py/multiarray/array_from_pyobj.c | 2 +-
doc/f2py/multiarray/fortran_array_from_pyobj.txt | 4 +-
doc/f2py/multiarray/transpose.txt | 2 +-
doc/f2py/multiarrays.txt | 2 +-
doc/f2py/oldnews.html | 2 +-
doc/f2py/options.tex | 2 +-
doc/f2py/python9.tex | 2 +-
doc/f2py/win32_notes.txt | 10 +-
doc/release/1.10.0-notes.rst | 95 +-
doc/release/1.10.1-notes.rst | 3 +-
doc/release/1.10.2-notes.rst | 9 +-
doc/release/1.10.3-notes.rst | 3 +-
doc/release/1.10.4-notes.rst | 3 +-
doc/release/1.11.0-notes.rst | 55 +-
doc/release/1.11.1-notes.rst | 3 +-
doc/release/1.11.2-notes.rst | 3 +-
doc/release/1.12.0-notes.rst | 12 +-
doc/release/1.13.0-notes.rst | 556 +
doc/release/1.13.1-notes.rst | 60 +
doc/release/1.3.0-notes.rst | 49 +-
doc/release/1.4.0-notes.rst | 45 +-
doc/release/1.5.0-notes.rst | 23 +-
doc/release/1.6.0-notes.rst | 31 +-
doc/release/1.6.1-notes.rst | 3 +-
doc/release/1.6.2-notes.rst | 15 +-
doc/release/1.7.0-notes.rst | 33 +-
doc/release/1.7.1-notes.rst | 3 +-
doc/release/1.7.2-notes.rst | 3 +-
doc/release/1.8.0-notes.rst | 65 +-
doc/release/1.8.1-notes.rst | 9 +-
doc/release/1.8.2-notes.rst | 3 +-
doc/release/1.9.0-notes.rst | 103 +-
doc/release/1.9.1-notes.rst | 3 +-
doc/release/1.9.2-notes.rst | 3 +-
doc/source/conf.py | 7 +-
doc/source/dev/gitwash/development_workflow.rst | 3 +-
doc/source/dev/gitwash/git_links.inc | 32 +-
doc/source/f2py/advanced.rst | 2 +-
doc/source/f2py/array_session.dat | 2 +-
doc/source/f2py/getting-started.rst | 2 +-
doc/source/f2py/index.rst | 32 +-
doc/source/f2py/python-usage.rst | 6 +-
doc/source/f2py/signature-file.rst | 8 +-
doc/source/glossary.rst | 5 -
doc/source/reference/arrays.classes.rst | 181 +-
doc/source/reference/arrays.datetime.rst | 7 +-
doc/source/reference/arrays.dtypes.rst | 43 +-
doc/source/reference/arrays.indexing.rst | 6 +-
doc/source/reference/arrays.ndarray.rst | 8 +-
doc/source/reference/arrays.scalars.rst | 29 +-
doc/source/reference/c-api.array.rst | 484 +-
doc/source/reference/c-api.iterator.rst | 67 +-
.../reference/c-api.types-and-structures.rst | 76 +-
doc/source/reference/c-api.ufunc.rst | 157 +-
doc/source/reference/distutils.rst | 2 +-
.../reference/internals.code-explanations.rst | 8 +-
doc/source/reference/maskedarray.baseclass.rst | 2 -
doc/source/reference/maskedarray.generic.rst | 2 +-
.../reference/routines.array-manipulation.rst | 1 +
doc/source/reference/routines.indexing.rst | 1 +
doc/source/reference/routines.linalg.rst | 1 +
doc/source/reference/routines.logic.rst | 1 +
doc/source/reference/routines.math.rst | 6 +
doc/source/reference/routines.other.rst | 9 +-
doc/source/reference/routines.set.rst | 1 +
doc/source/reference/swig.interface-file.rst | 12 +-
doc/source/reference/ufuncs.rst | 51 +-
doc/source/release.rst | 1 +
doc/source/user/basics.io.genfromtxt.rst | 104 +-
doc/source/user/building.rst | 4 +-
doc/source/user/c-info.beyond-basics.rst | 49 +-
doc/source/user/c-info.how-to-extend.rst | 33 +-
doc/source/user/c-info.python-as-glue.rst | 12 +-
doc/source/user/c-info.ufunc-tutorial.rst | 10 +-
doc/source/user/install.rst | 2 +-
doc/source/user/numpy-for-matlab-users.rst | 4 +-
doc/source/user/quickstart.rst | 64 +-
numpy/add_newdocs.py | 174 +-
numpy/core/__init__.py | 6 +-
numpy/core/_internal.py | 396 +-
numpy/core/arrayprint.py | 122 +-
numpy/core/code_generators/cversions.txt | 3 +
numpy/core/code_generators/genapi.py | 53 +-
numpy/core/code_generators/generate_numpy_api.py | 17 +-
numpy/core/code_generators/generate_ufunc_api.py | 19 +-
numpy/core/code_generators/generate_umath.py | 31 +-
numpy/core/code_generators/numpy_api.py | 2 +
numpy/core/code_generators/ufunc_docstrings.py | 355 +-
numpy/core/defchararray.py | 16 +-
numpy/core/einsumfunc.py | 8 +-
numpy/core/fromnumeric.py | 44 +-
numpy/core/function_base.py | 8 +-
numpy/core/getlimits.py | 319 +-
numpy/core/include/numpy/_numpyconfig.h.in | 52 -
numpy/core/include/numpy/ndarraytypes.h | 23 +-
numpy/core/include/numpy/npy_3kcompat.h | 48 +-
numpy/core/include/numpy/npy_common.h | 18 +-
numpy/core/include/numpy/npy_math.h | 279 +-
numpy/core/include/numpy/numpyconfig.h | 1 +
numpy/core/include/numpy/ufuncobject.h | 2 +-
numpy/core/machar.py | 2 +-
numpy/core/memmap.py | 6 +-
numpy/core/numeric.py | 195 +-
numpy/core/records.py | 45 +-
numpy/core/setup.py | 91 +-
numpy/core/setup_common.py | 10 +-
numpy/core/shape_base.py | 337 +-
numpy/core/src/multiarray/alloc.c | 34 +-
numpy/core/src/multiarray/alloc.h | 2 +
numpy/core/src/multiarray/arrayobject.c | 73 +-
numpy/core/src/multiarray/arraytypes.c.src | 193 +-
numpy/core/src/multiarray/calculation.c | 11 +-
numpy/core/src/multiarray/cblasfuncs.c | 133 +-
numpy/core/src/multiarray/common.c | 63 +-
numpy/core/src/multiarray/common.h | 82 +-
numpy/core/src/multiarray/compiled_base.c | 111 +-
numpy/core/src/multiarray/conversion_utils.c | 23 +-
numpy/core/src/multiarray/convert_datatype.c | 44 +-
numpy/core/src/multiarray/ctors.c | 44 +-
numpy/core/src/multiarray/datetime_busdaycal.c | 2 +-
numpy/core/src/multiarray/datetime_strings.c | 3 +-
numpy/core/src/multiarray/descriptor.c | 124 +-
numpy/core/src/multiarray/dtype_transfer.c | 4 +-
numpy/core/src/multiarray/getset.c | 6 +-
numpy/core/src/multiarray/hashdescr.c | 2 +-
numpy/core/src/multiarray/item_selection.c | 44 +-
numpy/core/src/multiarray/iterators.c | 4 +-
.../src/multiarray/lowlevel_strided_loops.c.src | 3 +
numpy/core/src/multiarray/mapping.c | 222 +-
numpy/core/src/multiarray/methods.c | 240 +-
numpy/core/src/multiarray/multiarray_tests.c.src | 11 +
numpy/core/src/multiarray/multiarraymodule.c | 325 +-
numpy/core/src/multiarray/nditer_api.c | 6 -
numpy/core/src/multiarray/nditer_constr.c | 116 +-
numpy/core/src/multiarray/nditer_impl.h | 2 +
numpy/core/src/multiarray/nditer_pywrap.c | 22 +-
numpy/core/src/multiarray/number.c | 453 +-
numpy/core/src/multiarray/number.h | 6 +-
numpy/core/src/multiarray/numpymemoryview.c | 308 -
numpy/core/src/multiarray/numpymemoryview.h | 29 -
numpy/core/src/multiarray/numpyos.c | 53 +-
numpy/core/src/multiarray/scalartypes.c.src | 95 +-
numpy/core/src/multiarray/sequence.c | 90 +-
numpy/core/src/multiarray/shape.c | 60 +-
numpy/core/src/multiarray/temp_elide.c | 394 +
numpy/core/src/multiarray/temp_elide.h | 15 +
numpy/core/src/npymath/npy_math.c | 9 +
.../{npy_math.c.src => npy_math_internal.h.src} | 76 +-
numpy/core/src/private/binop_override.h | 212 +
numpy/core/src/private/get_attr_string.h | 131 +
numpy/core/src/private/lowlevel_strided_loops.h | 129 +-
numpy/core/src/private/ufunc_override.c | 155 +
numpy/core/src/private/ufunc_override.h | 421 +-
numpy/core/src/umath/funcs.inc.src | 8 +
numpy/core/src/umath/loops.c.src | 193 +-
numpy/core/src/umath/loops.h.src | 34 +-
numpy/core/src/umath/override.c | 608 +
numpy/core/src/umath/override.h | 11 +
numpy/core/src/umath/reduction.c | 46 +-
numpy/core/src/umath/scalarmath.c.src | 50 +-
numpy/core/src/umath/ufunc_object.c | 650 +-
numpy/core/src/umath/ufunc_type_resolution.c | 66 +-
numpy/core/src/umath/ufunc_type_resolution.h | 7 +
numpy/core/src/umath/umath_tests.c.src | 23 +-
numpy/core/src/umath/umathmodule.c | 8 +-
numpy/core/tests/test_api.py | 13 +-
numpy/core/tests/test_arrayprint.py | 54 +-
numpy/core/tests/test_datetime.py | 60 +-
numpy/core/tests/test_defchararray.py | 233 +-
numpy/core/tests/test_deprecations.py | 299 +-
numpy/core/tests/test_dtype.py | 27 +-
numpy/core/tests/test_einsum.py | 2 +-
numpy/core/tests/test_extint128.py | 3 +-
numpy/core/tests/test_function_base.py | 10 +-
numpy/core/tests/test_getlimits.py | 41 +-
numpy/core/tests/test_half.py | 2 +
numpy/core/tests/test_indexing.py | 99 +-
numpy/core/tests/test_longdouble.py | 39 +-
numpy/core/tests/test_mem_overlap.py | 471 +-
numpy/core/tests/test_memmap.py | 7 +
numpy/core/tests/test_multiarray.py | 1115 +-
numpy/core/tests/test_nditer.py | 107 +-
numpy/core/tests/test_numeric.py | 34 +-
numpy/core/tests/test_numerictypes.py | 5 +-
numpy/core/tests/test_print.py | 10 +-
numpy/core/tests/test_records.py | 43 +-
numpy/core/tests/test_regression.py | 154 +-
numpy/core/tests/test_scalarmath.py | 160 +-
numpy/core/tests/test_shape_base.py | 219 +-
numpy/core/tests/test_ufunc.py | 43 +-
numpy/core/tests/test_umath.py | 729 +-
numpy/core/tests/test_unicode.py | 37 +-
numpy/distutils/ccompiler.py | 145 +-
numpy/distutils/command/build_src.py | 12 +-
numpy/distutils/command/egg_info.py | 14 +-
numpy/distutils/conv_template.py | 6 +-
numpy/distutils/exec_command.py | 476 +-
numpy/distutils/fcompiler/intel.py | 8 +-
numpy/distutils/from_template.py | 2 +-
numpy/distutils/intelccompiler.py | 12 +-
numpy/distutils/mingw32ccompiler.py | 172 +-
numpy/distutils/misc_util.py | 96 +-
numpy/distutils/msvc9compiler.py | 10 +-
numpy/distutils/msvccompiler.py | 4 +-
numpy/distutils/system_info.py | 2 +
numpy/distutils/tests/test_exec_command.py | 127 +
numpy/distutils/tests/test_misc_util.py | 1 -
numpy/distutils/tests/test_system_info.py | 6 +-
numpy/distutils/unixccompiler.py | 15 +-
numpy/doc/basics.py | 60 +-
numpy/doc/glossary.py | 17 +-
numpy/doc/indexing.py | 4 +-
numpy/doc/subclassing.py | 215 +-
numpy/f2py/capi_maps.py | 9 +-
numpy/f2py/cfuncs.py | 3 +-
numpy/f2py/crackfortran.py | 6 +-
numpy/f2py/src/fortranobject.c | 33 +-
numpy/f2py/tests/src/common/block.f | 11 +
numpy/f2py/tests/src/string/char.f90 | 29 +
numpy/f2py/tests/test_common.py | 26 +
numpy/f2py/tests/test_return_character.py | 19 +-
numpy/f2py/tests/test_string.py | 26 +
numpy/f2py/tests/util.py | 2 +-
numpy/fft/fftpack.py | 4 +-
numpy/fft/fftpack_litemodule.c | 12 +-
numpy/fft/helper.py | 4 +-
numpy/fft/tests/test_fftpack.py | 28 +-
numpy/fft/tests/test_helper.py | 1 -
numpy/lib/__init__.py | 5 +-
numpy/lib/_datasource.py | 2 +-
numpy/lib/_iotools.py | 31 +-
numpy/lib/arraypad.py | 2 +-
numpy/lib/arraysetops.py | 187 +-
numpy/lib/arrayterator.py | 4 +-
numpy/lib/format.py | 2 +-
numpy/lib/function_base.py | 480 +-
numpy/lib/index_tricks.py | 119 +-
numpy/lib/info.py | 10 +-
numpy/lib/mixins.py | 181 +
numpy/lib/nanfunctions.py | 40 +-
numpy/lib/npyio.py | 81 +-
numpy/lib/polynomial.py | 87 +-
numpy/lib/recfunctions.py | 62 +-
numpy/lib/shape_base.py | 175 +-
numpy/lib/stride_tricks.py | 9 +-
numpy/lib/tests/test__datasource.py | 3 +-
numpy/lib/tests/test__iotools.py | 111 +-
numpy/lib/tests/test_arraypad.py | 5 +-
numpy/lib/tests/test_arraysetops.py | 345 +-
numpy/lib/tests/test_format.py | 54 +-
numpy/lib/tests/test_function_base.py | 302 +-
numpy/lib/tests/test_index_tricks.py | 31 +
numpy/lib/tests/test_io.py | 26 +-
numpy/lib/tests/test_mixins.py | 218 +
numpy/lib/tests/test_nanfunctions.py | 28 +-
numpy/lib/tests/test_packbits.py | 188 +-
numpy/lib/tests/test_polynomial.py | 23 +
numpy/lib/tests/test_recfunctions.py | 15 +-
numpy/lib/tests/test_shape_base.py | 151 +-
numpy/lib/tests/test_stride_tricks.py | 12 +-
numpy/lib/tests/test_twodim_base.py | 3 +-
numpy/lib/tests/test_type_check.py | 50 +
numpy/lib/tests/test_ufunclike.py | 34 +-
numpy/lib/twodim_base.py | 4 +-
numpy/lib/type_check.py | 49 +-
numpy/lib/ufunclike.py | 77 +-
numpy/lib/user_array.py | 10 +-
numpy/lib/utils.py | 12 +-
numpy/linalg/lapack_lite/dlamch.c | 951 -
numpy/linalg/lapack_lite/dlapack_lite.c | 100832 ------------------
numpy/linalg/lapack_lite/{f2c_lite.c => f2c.c} | 95 +-
.../linalg/lapack_lite/{blas_lite.c => f2c_blas.c} | 1603 +-
.../lapack_lite/{zlapack_lite.c => f2c_c_lapack.c} | 26086 ++---
numpy/linalg/lapack_lite/f2c_config.c | 2082 +
numpy/linalg/lapack_lite/f2c_d_lapack.c | 42043 ++++++++
numpy/linalg/lapack_lite/f2c_lapack.c | 1659 +
numpy/linalg/lapack_lite/f2c_s_lapack.c | 39773 +++++++
.../lapack_lite/{zlapack_lite.c => f2c_z_lapack.c} | 12673 ++-
numpy/linalg/lapack_litemodule.c | 12 +-
numpy/linalg/linalg.py | 102 +-
numpy/linalg/setup.py | 13 +-
numpy/linalg/tests/test_build.py | 4 +-
numpy/linalg/tests/test_linalg.py | 423 +-
numpy/linalg/umath_linalg.c.src | 945 +-
numpy/ma/core.py | 774 +-
numpy/ma/extras.py | 125 +-
numpy/ma/mrecords.py | 6 +-
numpy/ma/tests/test_core.py | 358 +-
numpy/ma/tests/test_deprecations.py | 74 +
numpy/ma/tests/test_extras.py | 45 +-
numpy/ma/tests/test_mrecords.py | 25 +-
numpy/ma/tests/test_old_ma.py | 8 +-
numpy/ma/tests/test_regression.py | 3 +-
numpy/ma/tests/test_subclassing.py | 20 +-
numpy/ma/testutils.py | 8 +-
numpy/matrixlib/defmatrix.py | 54 +-
numpy/matrixlib/tests/test_defmatrix.py | 9 +-
numpy/polynomial/_polybase.py | 4 +-
numpy/polynomial/chebyshev.py | 15 +-
numpy/polynomial/hermite.py | 13 +-
numpy/polynomial/hermite_e.py | 13 +-
numpy/polynomial/laguerre.py | 13 +-
numpy/polynomial/legendre.py | 15 +-
numpy/polynomial/polynomial.py | 13 +-
numpy/polynomial/tests/test_classes.py | 8 +
numpy/random/mtrand/Python.pxi | 4 +-
numpy/random/mtrand/mtrand.c | 12610 +--
numpy/random/mtrand/mtrand.pyx | 69 +-
numpy/random/tests/test_random.py | 121 +-
numpy/random/tests/test_regression.py | 9 -
numpy/testing/tests/test_decorators.py | 4 +-
numpy/testing/tests/test_utils.py | 246 +-
numpy/testing/utils.py | 154 +-
numpy/tests/test_scripts.py | 6 +-
numpy/tests/test_warnings.py | 4 +-
numpy/version.py | 8 +-
setup.py | 7 +-
338 files changed, 130324 insertions(+), 134562 deletions(-)
diff --cc debian/.git-dpm
index 55638b0,0000000..266f021
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
- 285b463e037cd9aeaf37ccc90ccf3349cc84b88a
- 285b463e037cd9aeaf37ccc90ccf3349cc84b88a
- db9ad0d21c51a5a4983387c232c00bd6f844e406
++214c56af4a982247c2dbbbe72ccf07ec1b2073cb
++214c56af4a982247c2dbbbe72ccf07ec1b2073cb
++b10475f0d78c8a87a159760ecfeb5083d8f33c27
+b10475f0d78c8a87a159760ecfeb5083d8f33c27
+python-numpy_1.13.1.orig.tar.gz
+75280fa6aba29423d4728c01963b688cfb7fab4d
+4514149
+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 70c5ff9,0000000..159269d
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 5a22e4a59f5e97674eebffedbcd12758991a9302 Mon Sep 17 00:00:00 2001
++From d9827cadf2de92020a0aff312e9376617457752d 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 d9e9ba5..8f8deca 100644
++index 1b39840..6ea4959 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 418b6a5,0000000..5e382f4
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 4b26915f32eec3afa476d678bc7831ab7b1899c1 Mon Sep 17 00:00:00 2001
++From 214c56af4a982247c2dbbbe72ccf07ec1b2073cb 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 9a5c300..124d57c 100644
++index 397aaf2..297422f 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 f56de93,0000000..a0519e8
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 d41c1a14d57a79fc6f754c2e863a0931dfa4b4aa Mon Sep 17 00:00:00 2001
++From 09c2b7dc3a92ef64af87dca072b0b5e422e46eea 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 df1c898,0000000..5287be3
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 d0e5187880c090f14e2a1752d6f0c39a075670d3 Mon Sep 17 00:00:00 2001
++From 716f582a7b91eda1abcbc08e6e9b6d024b2df824 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 8c18e42..faa289c 100644
++index cce0716..d99893f 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
- @@ -200,7 +200,7 @@ texinfo_documents = [
++@@ -201,7 +201,7 @@ texinfo_documents = [
+ # Intersphinx configuration
+ # -----------------------------------------------------------------------------
+ intersphinx_mapping = {
+- 'python': ('https://docs.python.org/dev', None),
++ 'python': ('https://docs.python.org/dev', '../../debian/python.org_objects.inv'),
+ 'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
+ 'matplotlib': ('http://matplotlib.org', None)
+ }
diff --cc debian/patches/adapt_swig_docs_to_debian.patch
index bab1c9b,0000000..dcbbecb
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 ef8be94c358fbd1825871ddde7cf740bd57af900 Mon Sep 17 00:00:00 2001
++From 21720a15c4421b9752e5cec467e0e9fbe1127c53 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 94fe83d..1352e54 100644
++index 6dd74f4..0efb79d 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 f7ca6f0,0000000..b25bce4
mode 100644,000000..100644
--- a/debian/patches/python3-soabi.patch
+++ b/debian/patches/python3-soabi.patch
@@@ -1,48 -1,0 +1,48 @@@
- From fa78d74fbad8f8e8aa0f8c722781d87dc16bf8bc Mon Sep 17 00:00:00 2001
++From 67521400850ae615b1ad18b3835f2b3cc6c31d25 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 7332822..582c157 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 2c58f11..05ba15e 100644
+--- a/numpy/tests/test_ctypeslib.py
++++ b/numpy/tests/test_ctypeslib.py
+@@ -34,6 +34,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 ==
diff --cc debian/patches/series
index 1c0859b,0000000..3e2b507
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,6 @@@
+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
+0006-disable-asserts-on-ppc-with-broken-malloc-only-longd.patch
- 0007-BUG-Don-t-signal-FP-exceptions-in-np.absolute.patch
--
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