NumPy 1.13.0

Highlights
* Operations like a + b + c will reuse temporaries on some platforms,
  resulting in less memory use and faster execution.
* Inplace operations check if inputs overlap outputs and create temporaries
  to avoid problems.
* New __array_ufunc__ attribute provides improved ability for classes to
  override default ufunc behavior.
* New np.block function for creating blocked arrays.

New functions
* New np.positive ufunc.
* New np.divmod ufunc provides more efficient divmod.
* New np.isnat ufunc tests for NaT special values.
* New np.heaviside ufunc computes the Heaviside function.
* New np.isin function, improves on in1d.
* New np.block function for creating blocked arrays.
* New PyArray_MapIterArrayCopyIfOverlap added to NumPy C-API.

5 files changed, 30 insertions, 33 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index c2d7fb04392..4859d1fe3a1 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2017/03/24 19:22:27 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2017/06/15 07:02:53 adam Exp $
 
-DISTNAME=	numpy-1.12.1
+DISTNAME=	numpy-1.13.0
 GITHUB_PROJECT=	numpy
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numpy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST
index c4da310cea7..db618748cde 100644
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2017/03/20 13:50:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/06/15 07:02:53 adam Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -473,6 +473,7 @@ ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_non_compound.f90
 ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_real.f90
 ${PYSITELIB}/numpy/f2py/tests/src/regression/inout.f90
 ${PYSITELIB}/numpy/f2py/tests/src/size/foo.f90
+${PYSITELIB}/numpy/f2py/tests/src/string/char.f90
 ${PYSITELIB}/numpy/f2py/tests/test_array_from_pyobj.py
 ${PYSITELIB}/numpy/f2py/tests/test_assumed_shape.py
 ${PYSITELIB}/numpy/f2py/tests/test_callback.py
@@ -486,6 +487,7 @@ ${PYSITELIB}/numpy/f2py/tests/test_return_integer.py
 ${PYSITELIB}/numpy/f2py/tests/test_return_logical.py
 ${PYSITELIB}/numpy/f2py/tests/test_return_real.py
 ${PYSITELIB}/numpy/f2py/tests/test_size.py
+${PYSITELIB}/numpy/f2py/tests/test_string.py
 ${PYSITELIB}/numpy/f2py/tests/util.py
 ${PYSITELIB}/numpy/f2py/use_rules.py
 ${PYSITELIB}/numpy/f2py/use_rules.pyc
@@ -544,6 +546,9 @@ ${PYSITELIB}/numpy/lib/index_tricks.pyo
 ${PYSITELIB}/numpy/lib/info.py
 ${PYSITELIB}/numpy/lib/info.pyc
 ${PYSITELIB}/numpy/lib/info.pyo
+${PYSITELIB}/numpy/lib/mixins.py
+${PYSITELIB}/numpy/lib/mixins.pyc
+${PYSITELIB}/numpy/lib/mixins.pyo
 ${PYSITELIB}/numpy/lib/nanfunctions.py
 ${PYSITELIB}/numpy/lib/nanfunctions.pyc
 ${PYSITELIB}/numpy/lib/nanfunctions.pyo
@@ -585,6 +590,7 @@ ${PYSITELIB}/numpy/lib/tests/test_format.py
 ${PYSITELIB}/numpy/lib/tests/test_function_base.py
 ${PYSITELIB}/numpy/lib/tests/test_index_tricks.py
 ${PYSITELIB}/numpy/lib/tests/test_io.py
+${PYSITELIB}/numpy/lib/tests/test_mixins.py
 ${PYSITELIB}/numpy/lib/tests/test_nanfunctions.py
 ${PYSITELIB}/numpy/lib/tests/test_packbits.py
 ${PYSITELIB}/numpy/lib/tests/test_polynomial.py
@@ -648,6 +654,7 @@ ${PYSITELIB}/numpy/ma/setup.py
 ${PYSITELIB}/numpy/ma/setup.pyc
 ${PYSITELIB}/numpy/ma/setup.pyo
 ${PYSITELIB}/numpy/ma/tests/test_core.py
+${PYSITELIB}/numpy/ma/tests/test_deprecations.py
 ${PYSITELIB}/numpy/ma/tests/test_extras.py
 ${PYSITELIB}/numpy/ma/tests/test_mrecords.py
 ${PYSITELIB}/numpy/ma/tests/test_old_ma.py
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index af60bfed21b..eac850ae380 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.22 2017/03/24 19:22:27 joerg Exp $
+$NetBSD: distinfo,v 1.23 2017/06/15 07:02:53 adam Exp $
 
-SHA1 (numpy-1.12.1.tar.gz) = d7664803ffcbb07db9275d08cf9e0a55dad327d3
-RMD160 (numpy-1.12.1.tar.gz) = 059590c2379bb403fc03cc511dc8fb5e22042f93
-SHA512 (numpy-1.12.1.tar.gz) = 587ff43161cf05f7c01236c72f31185d1e120b1cd3004ed010ee2a541d91c33ceca57b073ec9f806cfa5f060e0e5213f720c9e3a1315ba1873b311a9655005b1
-Size (numpy-1.12.1.tar.gz) = 4484212 bytes
+SHA1 (numpy-1.13.0.tar.gz) = 4a7234e59f0a36e4a90006a4739cb09d7c0488e0
+RMD160 (numpy-1.13.0.tar.gz) = 39952d1b0c7b36a244e87d10cde387a45998c4f6
+SHA512 (numpy-1.13.0.tar.gz) = f95108f6e3319b3a1e9fc18af59e04ed55b434a1b5fff7b13207c24e9002d5adfa4046dc0cc3d8f13957fa4e2a18b932bc41347fa1aeddd12ef6598861670c83
+Size (numpy-1.13.0.tar.gz) = 4334265 bytes
 SHA1 (patch-aa) = c964fa13fb120b1b0f9d0bf5bc713507cd60b945
 SHA1 (patch-ab) = b421455fdbb666c8075d8bffbeb59533434d23e6
-SHA1 (patch-numpy_core_src_multiarray_numpyos.c) = acd97c7bae3419be4cb2e706d1989abe7e02c807
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 4342b48051dd424df99e95032f8a870a05114302
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 5df9710db0f1cf1265ed57d86521a1627c461daf
diff --git a/math/py-numpy/patches/patch-numpy_core_src_multiarray_numpyos.c b/math/py-numpy/patches/patch-numpy_core_src_multiarray_numpyos.c
deleted file mode 100644
index 03fde16fb37..00000000000
--- a/math/py-numpy/patches/patch-numpy_core_src_multiarray_numpyos.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-numpy_core_src_multiarray_numpyos.c,v 1.1 2016/07/24 15:25:22 kamil Exp $
-
-Don't include <xlocale.h> for NetBSD.
-
---- numpy/core/src/multiarray/numpyos.c.orig	2016-06-25 15:38:34.000000000 +0000
-+++ numpy/core/src/multiarray/numpyos.c
-@@ -15,8 +15,10 @@
- 
- #ifdef HAVE_STRTOLD_L
- #include <stdlib.h>
-+#if !defined(__NetBSD__)
- #include <xlocale.h>
- #endif
-+#endif
- 
- 
- 
diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
index 3363d146e07..4f06f15134c 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,11 +1,12 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.11 2017/03/24 19:22:28 joerg Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.12 2017/06/15 07:02:53 adam Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
 On OS X, do not use '-bundle' and 'dynamic_lookup' (to avoid Python.framework).
+Do not use -funroll-loops compiler flag.
 Do not run a shell command when it is "None".
 
---- numpy/distutils/fcompiler/gnu.py.orig	2017-03-18 15:29:25.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2017-06-07 15:26:35.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
 @@ -57,8 +57,10 @@ class GnuFCompiler(FCompiler):
                      return ('gfortran', m.group(1))
@@ -37,7 +38,15 @@ Do not run a shell command when it is "None".
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -270,7 +272,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -215,7 +217,6 @@ class GnuFCompiler(FCompiler):
+             opt = ['-O2']
+         else:
+             opt = ['-O3']
+-        opt.append('-funroll-loops')
+         return opt
+ 
+     def _c_arch_flags(self):
+@@ -270,7 +271,7 @@ class Gnu95FCompiler(GnuFCompiler):
                            "-fno-second-underscore"] + _EXTRAFLAGS,
          'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
@@ -46,12 +55,12 @@ Do not run a shell command when it is "None".
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -283,7 +285,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -283,7 +284,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""
 -        if not sys.platform == 'darwin':
-+        if not sys.platform == 'darwin' or cmd==None:
++        if not sys.platform == 'darwin' or cmd is None:
              return []
          arch_flags = []
          # get arches the C compiler gets.