[Python-modules-commits] [python-numpy] 10/13: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Dec 18 03:18:46 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 378e0fa19f82083a7aa64b04ea7e4335822226e2
Merge: 039c7b6 991f5fb
Author: Sandro Tosi <morph at debian.org>
Date: Sat Dec 17 20:40:56 2016 -0500
merge patched into master
INSTALL.rst.txt | 28 +-
PKG-INFO | 13 +-
debian/.git-dpm | 6 +-
.../0005-Dont-fail-if-we-cant-import-mingw32.patch | 4 +-
...erts-on-ppc-with-broken-malloc-only-longd.patch | 4 +-
debian/patches/03_force_f2py_version.patch | 2 +-
.../10_use_local_python.org_object.inv_sphinx.diff | 18 +-
debian/patches/adapt_swig_docs_to_debian.patch | 4 +-
debian/patches/python3-soabi.patch | 8 +-
doc/f2py/index.html | 2 +-
doc/release/1.11.0-notes.rst | 5 +-
doc/release/1.12.0-notes.rst | 1017 +
doc/source/_static/.gitignore | 2 +
doc/source/_templates/indexcontent.html | 20 +-
doc/source/about.rst | 8 +-
doc/source/bugs.rst | 2 +-
doc/source/conf.py | 10 +-
doc/source/contents.rst | 2 +-
doc/source/dev/development_environment.rst | 28 +-
doc/source/dev/gitwash/development_setup.rst | 42 +-
doc/source/dev/gitwash/development_workflow.rst | 163 +-
doc/source/dev/index.rst | 2 +-
doc/source/f2py/distutils.rst | 2 +-
doc/source/f2py/getting-started.rst | 4 +-
doc/source/f2py/python-usage.rst | 12 +-
doc/source/f2py/signature-file.rst | 6 +-
doc/source/license.rst | 2 +-
doc/source/neps/index.rst | 6 +-
doc/source/reference/arrays.classes.rst | 6 +-
doc/source/reference/arrays.datetime.rst | 6 +-
doc/source/reference/arrays.dtypes.rst | 6 +-
doc/source/reference/arrays.indexing.rst | 4 +-
doc/source/reference/arrays.interface.rst | 2 +-
doc/source/reference/arrays.ndarray.rst | 12 +-
doc/source/reference/arrays.rst | 2 +-
doc/source/reference/arrays.scalars.rst | 4 +-
doc/source/reference/c-api.array.rst | 21 +-
doc/source/reference/c-api.config.rst | 8 +-
doc/source/reference/c-api.coremath.rst | 4 +-
doc/source/reference/c-api.generalized-ufuncs.rst | 6 +-
doc/source/reference/c-api.iterator.rst | 2 +-
doc/source/reference/c-api.rst | 2 +-
.../reference/c-api.types-and-structures.rst | 91 +-
doc/source/reference/distutils.rst | 2 +-
doc/source/reference/index.rst | 8 +-
.../reference/internals.code-explanations.rst | 2 +-
doc/source/reference/internals.rst | 2 +-
doc/source/reference/routines.array-creation.rst | 1 +
.../reference/routines.array-manipulation.rst | 1 +
doc/source/reference/routines.help.rst | 2 +-
doc/source/reference/routines.io.rst | 2 +-
doc/source/reference/routines.math.rst | 4 +
doc/source/reference/routines.numarray.rst | 2 +-
doc/source/reference/routines.oldnumeric.rst | 2 +-
doc/source/reference/routines.other.rst | 2 +-
.../reference/routines.polynomials.classes.rst | 2 +-
.../reference/routines.polynomials.polynomial.rst | 1 +
doc/source/reference/swig.interface-file.rst | 6 +-
doc/source/reference/swig.rst | 2 +-
doc/source/reference/ufuncs.rst | 11 +-
doc/source/release.rst | 1 +
doc/source/user/basics.io.genfromtxt.rst | 54 +-
doc/source/user/basics.io.rst | 2 +-
doc/source/user/basics.rst | 2 +-
doc/source/user/building.rst | 8 +-
doc/source/user/c-info.python-as-glue.rst | 37 +-
doc/source/user/c-info.rst | 2 +-
doc/source/user/c-info.ufunc-tutorial.rst | 38 +-
doc/source/user/numpy-for-matlab-users.rst | 40 +-
doc/source/user/quickstart.rst | 119 +-
doc/sphinxext/.travis.yml | 11 +-
doc/sphinxext/MANIFEST.in | 6 +
doc/sphinxext/README.rst | 8 +
doc/sphinxext/numpydoc/docscrape.py | 160 +-
doc/sphinxext/numpydoc/docscrape_sphinx.py | 32 +-
doc/sphinxext/numpydoc/numpydoc.py | 57 +-
doc/sphinxext/numpydoc/tests/test_docscrape.py | 148 +-
doc/sphinxext/numpydoc/traitsdoc.py | 3 +-
doc/sphinxext/setup.py | 17 +-
numpy/__init__.py | 7 +-
numpy/_build_utils/README | 2 +-
numpy/_build_utils/src/apple_sgemv_fix.c | 2 +-
numpy/_distributor_init.py | 10 +
numpy/_import_tools.py | 2 +-
numpy/add_newdocs.py | 177 +-
numpy/compat/_inspect.py | 2 +-
numpy/compat/py3k.py | 14 +-
numpy/core/__init__.py | 16 +-
numpy/core/_internal.py | 6 +-
numpy/core/_methods.py | 21 +-
numpy/core/arrayprint.py | 158 +-
numpy/core/code_generators/cversions.txt | 3 +-
numpy/core/code_generators/generate_numpy_api.py | 2 +-
numpy/core/code_generators/generate_ufunc_api.py | 2 +-
numpy/core/code_generators/generate_umath.py | 83 +-
numpy/core/code_generators/ufunc_docstrings.py | 76 +-
numpy/core/defchararray.py | 14 +-
numpy/core/einsumfunc.py | 993 +
numpy/core/fromnumeric.py | 393 +-
numpy/core/function_base.py | 168 +-
numpy/core/getlimits.py | 17 +-
numpy/core/include/numpy/_numpyconfig.h.in | 1 +
numpy/core/include/numpy/ndarrayobject.h | 5 +-
numpy/core/include/numpy/ndarraytypes.h | 23 +-
numpy/core/include/numpy/noprefix.h | 2 +
numpy/core/include/numpy/npy_3kcompat.h | 8 +
numpy/core/include/numpy/npy_common.h | 34 +-
numpy/core/include/numpy/npy_endian.h | 7 +-
numpy/core/include/numpy/numpyconfig.h | 3 +-
numpy/core/include/numpy/oldnumeric.h | 2 +
numpy/core/include/numpy/ufuncobject.h | 12 +-
numpy/core/info.py | 2 +-
numpy/core/memmap.py | 45 +-
numpy/core/numeric.py | 425 +-
numpy/core/numerictypes.py | 2 +-
numpy/core/records.py | 2 +-
numpy/core/setup.py | 30 +-
numpy/core/setup_common.py | 17 +-
numpy/core/shape_base.py | 16 +-
numpy/core/src/multiarray/_datetime.h | 2 +-
numpy/core/src/multiarray/alloc.c | 2 +-
numpy/core/src/multiarray/array_assign_array.c | 4 +-
numpy/core/src/multiarray/arrayobject.c | 60 +-
numpy/core/src/multiarray/arraytypes.c.src | 46 +-
numpy/core/src/multiarray/buffer.c | 2 +-
numpy/core/src/multiarray/calculation.c | 22 +-
numpy/core/src/multiarray/common.c | 1 +
numpy/core/src/multiarray/compiled_base.c | 444 +-
numpy/core/src/multiarray/compiled_base.h | 2 +
numpy/core/src/multiarray/conversion_utils.c | 116 +-
numpy/core/src/multiarray/convert.c | 23 +-
numpy/core/src/multiarray/ctors.c | 106 +-
numpy/core/src/multiarray/ctors.h | 6 +
numpy/core/src/multiarray/datetime_busdaycal.c | 2 +-
numpy/core/src/multiarray/datetime_busdaycal.h | 2 +-
numpy/core/src/multiarray/datetime_strings.c | 6 +-
numpy/core/src/multiarray/descriptor.c | 57 +-
numpy/core/src/multiarray/dtype_transfer.c | 117 +-
numpy/core/src/multiarray/einsum.c.src | 2 +-
numpy/core/src/multiarray/getset.c | 12 +-
numpy/core/src/multiarray/item_selection.c | 42 +-
numpy/core/src/multiarray/iterators.c | 157 +-
numpy/core/src/multiarray/iterators.h | 5 -
.../src/multiarray/lowlevel_strided_loops.c.src | 2 +-
numpy/core/src/multiarray/mapping.c | 158 +-
numpy/core/src/multiarray/methods.c | 156 +-
numpy/core/src/multiarray/multiarraymodule.c | 35 +-
numpy/core/src/multiarray/nditer_api.c | 4 +-
numpy/core/src/multiarray/nditer_constr.c | 2 +-
numpy/core/src/multiarray/nditer_pywrap.c | 22 +-
numpy/core/src/multiarray/nditer_templ.c.src | 2 +-
numpy/core/src/multiarray/number.c | 21 +-
numpy/core/src/multiarray/numpyos.c | 2 +-
numpy/core/src/multiarray/numpyos.h | 2 +-
numpy/core/src/multiarray/scalarapi.c | 2 +-
numpy/core/src/multiarray/scalartypes.c.src | 68 +-
numpy/core/src/multiarray/shape.c | 111 +-
numpy/core/src/multiarray/usertypes.c | 2 +-
numpy/core/src/npymath/npy_math.c.src | 4 +-
numpy/core/src/npysort/quicksort.c.src | 101 +-
numpy/core/src/npysort/selection.c.src | 14 +-
numpy/core/src/private/lowlevel_strided_loops.h | 2 +-
numpy/core/src/private/npy_sort.h | 8 +
numpy/core/src/umath/funcs.inc.src | 2 +-
numpy/core/src/umath/loops.c.src | 191 +-
numpy/core/src/umath/loops.h.src | 32 +-
numpy/core/src/umath/reduction.c | 2 +-
numpy/core/src/umath/scalarmath.c.src | 96 +-
numpy/core/src/umath/simd.inc.src | 164 +-
numpy/core/src/umath/struct_ufunc_test.c.src | 2 +-
numpy/core/src/umath/test_rational.c.src | 2 +-
numpy/core/src/umath/ufunc_object.c | 148 +-
numpy/core/src/umath/ufunc_type_resolution.c | 36 +
numpy/core/src/umath/ufunc_type_resolution.h | 122 +-
numpy/core/tests/test_api.py | 25 +-
numpy/core/tests/test_arrayprint.py | 39 +
numpy/core/tests/test_datetime.py | 72 +-
numpy/core/tests/test_deprecations.py | 382 +-
numpy/core/tests/test_dtype.py | 25 +
numpy/core/tests/test_einsum.py | 871 +-
numpy/core/tests/test_function_base.py | 208 +-
numpy/core/tests/test_getlimits.py | 18 +-
numpy/core/tests/test_indexing.py | 284 +-
numpy/core/tests/test_item_selection.py | 8 +-
numpy/core/tests/test_machar.py | 2 +-
numpy/core/tests/test_mem_overlap.py | 6 +
numpy/core/tests/test_memmap.py | 67 +-
numpy/core/tests/test_multiarray.py | 333 +-
numpy/core/tests/test_nditer.py | 76 +-
numpy/core/tests/test_numeric.py | 272 +-
numpy/core/tests/test_records.py | 52 +-
numpy/core/tests/test_regression.py | 228 +-
numpy/core/tests/test_scalarmath.py | 121 +-
numpy/core/tests/test_shape_base.py | 9 +
numpy/core/tests/test_ufunc.py | 19 +
numpy/core/tests/test_umath.py | 152 +-
numpy/core/tests/test_unicode.py | 52 +-
numpy/ctypeslib.py | 8 +-
numpy/distutils/command/build_src.py | 2 +-
numpy/distutils/command/config.py | 4 +-
numpy/distutils/command/egg_info.py | 2 +-
numpy/distutils/conv_template.py | 6 +-
numpy/distutils/core.py | 15 +-
numpy/distutils/cpuinfo.py | 10 +-
numpy/distutils/exec_command.py | 18 +-
numpy/distutils/extension.py | 2 +-
numpy/distutils/fcompiler/__init__.py | 8 +-
numpy/distutils/fcompiler/gnu.py | 16 +-
numpy/distutils/from_template.py | 2 +-
numpy/distutils/mingw32ccompiler.py | 2 +-
numpy/distutils/misc_util.py | 21 +-
numpy/distutils/msvc9compiler.py | 2 +
numpy/distutils/system_info.py | 208 +-
numpy/distutils/tests/test_system_info.py | 5 +-
numpy/doc/basics.py | 10 +-
numpy/doc/byteswapping.py | 4 +-
numpy/doc/constants.py | 12 +-
numpy/doc/creation.py | 6 +-
numpy/doc/glossary.py | 4 +-
numpy/doc/indexing.py | 10 +-
numpy/doc/internals.py | 10 +-
numpy/doc/structured_arrays.py | 4 +-
numpy/doc/subclassing.py | 53 +-
numpy/doc/ufuncs.py | 2 +-
numpy/dual.py | 2 +-
numpy/f2py/capi_maps.py | 2 +-
numpy/f2py/crackfortran.py | 2 +-
numpy/f2py/rules.py | 6 +-
numpy/fft/fftpack.py | 107 +-
numpy/fft/helper.py | 99 +
numpy/fft/tests/test_helper.py | 79 +
numpy/lib/_datasource.py | 4 +-
numpy/lib/_version.py | 6 +-
numpy/lib/arraypad.py | 35 +-
numpy/lib/arraysetops.py | 44 +-
numpy/lib/financial.py | 11 +-
numpy/lib/format.py | 35 +-
numpy/lib/function_base.py | 650 +-
numpy/lib/info.py | 6 +-
numpy/lib/nanfunctions.py | 254 +-
numpy/lib/npyio.py | 121 +-
numpy/lib/polynomial.py | 19 +-
numpy/lib/shape_base.py | 16 +-
numpy/lib/stride_tricks.py | 69 +-
numpy/lib/tests/test_arraypad.py | 18 +
numpy/lib/tests/test_arraysetops.py | 8 +
numpy/lib/tests/test_financial.py | 7 +-
numpy/lib/tests/test_format.py | 22 +
numpy/lib/tests/test_function_base.py | 463 +-
numpy/lib/tests/test_index_tricks.py | 27 +
numpy/lib/tests/test_io.py | 175 +-
numpy/lib/tests/test_nanfunctions.py | 189 +-
numpy/lib/tests/test_polynomial.py | 32 +-
numpy/lib/tests/test_shape_base.py | 60 +-
numpy/lib/tests/test_stride_tricks.py | 17 +
numpy/lib/tests/test_twodim_base.py | 41 +-
numpy/lib/tests/test_type_check.py | 35 +
numpy/lib/tests/test_utils.py | 7 +-
numpy/lib/twodim_base.py | 117 +-
numpy/lib/type_check.py | 18 +-
numpy/lib/ufunclike.py | 4 +-
numpy/lib/utils.py | 16 +-
numpy/linalg/lapack_lite/dlapack_lite.c | 6 +-
numpy/linalg/lapack_lite/zlapack_lite.c | 4 +-
numpy/linalg/linalg.py | 80 +-
numpy/linalg/tests/test_linalg.py | 10 +-
numpy/linalg/tests/test_regression.py | 8 +-
numpy/ma/core.py | 219 +-
numpy/ma/extras.py | 144 +-
numpy/ma/mrecords.py | 10 +-
numpy/ma/tests/test_core.py | 236 +-
numpy/ma/tests/test_extras.py | 105 +-
numpy/ma/tests/test_mrecords.py | 10 +-
numpy/ma/tests/test_old_ma.py | 122 +-
numpy/ma/tests/test_regression.py | 8 +-
numpy/ma/tests/test_subclassing.py | 2 +-
numpy/ma/testutils.py | 8 +-
numpy/matrixlib/defmatrix.py | 2 +-
numpy/polynomial/_polybase.py | 6 +-
numpy/polynomial/chebyshev.py | 4 +-
numpy/polynomial/hermite.py | 4 +-
numpy/polynomial/hermite_e.py | 6 +-
numpy/polynomial/laguerre.py | 4 +-
numpy/polynomial/legendre.py | 4 +-
numpy/polynomial/polynomial.py | 97 +-
numpy/polynomial/polyutils.py | 4 +-
numpy/polynomial/tests/test_chebyshev.py | 2 +-
numpy/polynomial/tests/test_hermite.py | 2 +-
numpy/polynomial/tests/test_hermite_e.py | 2 +-
numpy/polynomial/tests/test_laguerre.py | 2 +-
numpy/polynomial/tests/test_legendre.py | 2 +-
numpy/polynomial/tests/test_polynomial.py | 66 +-
numpy/random/mtrand/Python.pxi | 14 -
numpy/random/mtrand/distributions.c | 5 +
numpy/random/mtrand/mt_compat.h | 68 -
numpy/random/mtrand/mtrand.c | 31649 ++++++++++---------
numpy/random/mtrand/mtrand.pyx | 1503 +-
numpy/random/mtrand/numpy.pxd | 6 -
numpy/random/mtrand/randint_helpers.pxi | 462 +
numpy/random/setup.py | 9 +-
numpy/random/tests/test_random.py | 847 +-
numpy/testing/decorators.py | 13 +-
numpy/testing/nosetester.py | 79 +-
numpy/testing/tests/test_decorators.py | 14 +-
numpy/testing/tests/test_utils.py | 277 +-
numpy/testing/utils.py | 563 +-
numpy/tests/test_ctypeslib.py | 14 +-
numpy/tests/test_scripts.py | 14 +-
numpy/tests/test_warnings.py | 86 +
numpy/version.py | 8 +-
setup.py | 33 +-
site.cfg.example | 23 +-
tools/swig/numpy.i | 7 +-
313 files changed, 30526 insertions(+), 20889 deletions(-)
diff --cc debian/.git-dpm
index c887268,0000000..4a9092f
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
- aa8ac41999c03a97170e10501a2f0fd0f40735db
- aa8ac41999c03a97170e10501a2f0fd0f40735db
- 550e95467de567d36e500b55e311132da0f90a58
++991f5fbddc3d7e9c53d8898819ada6e22cf4fdf7
++991f5fbddc3d7e9c53d8898819ada6e22cf4fdf7
++d18a9b1d0f2516b44ca02d1415f369f9e40adf61
+d18a9b1d0f2516b44ca02d1415f369f9e40adf61
+python-numpy_1.12.0~b1.orig.tar.gz
+c711101f0b28f1a5e2363357d534c572eeacd4a8
+4268586
+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 8d02478,0000000..07732b7
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 0f259783800380fbcdd4d2b994556eadbaff65a5 Mon Sep 17 00:00:00 2001
++From 51c16076f33bbb0ecd4d2c22a86d5199fd3ae4f6 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
++index d9e9ba5..8f8deca 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 8a7b048,0000000..ec3ba68
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 aa8ac41999c03a97170e10501a2f0fd0f40735db Mon Sep 17 00:00:00 2001
++From 991f5fbddc3d7e9c53d8898819ada6e22cf4fdf7 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
++index b8381ab..58daa47 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 bdfe5ea,0000000..46f7524
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 67303779325ab19337f4db61e632aa1d47e24dbc Mon Sep 17 00:00:00 2001
++From b1fbf011c03587bd7bfba23c80561dd0b8e6a1e2 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 b688151,0000000..2c09af2
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 7f94f26564b44462f601c6d742b9eec35b909fc9 Mon Sep 17 00:00:00 2001
++From 8505e775c4b9d898f2c4e3194f0fa846a125cf6e 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
++index 8c18e42..faa289c 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
- @@ -199,7 +199,7 @@ texinfo_documents = [
- # -----------------------------------------------------------------------------
++@@ -200,7 +200,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'}
-
-
- # -----------------------------------------------------------------------------
++ 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 a1c6a0d,0000000..d85e3b1
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 ee82d062347fe0b69dfcad8d0711413b4bfa9323 Mon Sep 17 00:00:00 2001
++From ab71744964e7af4e7998e210b95f42373691b97b 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
++index 94fe83d..1352e54 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 9d347c0,0000000..9c6e3ee
mode 100644,000000..100644
--- a/debian/patches/python3-soabi.patch
+++ b/debian/patches/python3-soabi.patch
@@@ -1,48 -1,0 +1,48 @@@
- From 3ce9cc57344a8f4026cfd1426c8bb7a6a1bc7b8d Mon Sep 17 00:00:00 2001
++From 27587e85011f435e27c12fc72992317a5276ccad 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
++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 5e888eb..9e7fc2d 100644
++index 2c58f11..05ba15e 100644
+--- a/numpy/tests/test_ctypeslib.py
++++ b/numpy/tests/test_ctypeslib.py
- @@ -27,6 +27,7 @@ class TestLoadLibrary(TestCase):
++@@ -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 ==
--
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