CVS commit: pkgsrc/math/py-numpy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math/py-numpy
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 27 Apr 2020 17:00:36 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 27 17:00:36 UTC 2020

Modified Files:
        pkgsrc/math/py-numpy: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/math/py-numpy/patches: patch-numpy_distutils_system__info.py
            patch-numpy_linalg_lapack__litemodule.c

Log Message:
py-numpy: updated to 1.18.3

1.18.3:
BUG: Fix eigh and cholesky methods of numpy.random.multivariate_normalBUG,MAINT: Remove incorrect special case in string to number...
BUG: Guarantee array is in valid state after memory error occurs...
BUG: Check that `pvals` is 1D in `_generator.multinomial`.
BUG: Alpha parameter must be 1D in `generator.dirichlet`

1.18.2:
TST: move _no_tracing to testing._private
MAINT: Large overhead in some random functions
TST: Do not create gfortran link in azure Mac testing.
BUG: Added missing error check in `ndarray.__contains__`
MAINT: use list-based APIs to call subprocesses
REL: Prepare for 1.18.2 release.
BUG: fix logic error when nm fails on 32-bit

1.18.1:
MAINT: Update pavement.py for towncrier.
DOC: add moved modules to 1.18 release note
MAINT, DOC: Minor backports and updates for 1.18.x
TST: Add assert_array_equal test for big integer arrays
BUG: use tmp dir and check version for cython test
BUG: distutils: fix msvc+gfortran openblas handling corner case
BUG: remove -std=c99 for c++ compilation
MAINT: unskip test on win32
TST: add BLAS ILP64 run in Travis & Azure
MAINT: only add --std=c99 where needed
BUG: lib: Fix handling of integer arrays by gradient.
MAINT: Do not use private Python function in testing
REL: Prepare for the NumPy 1.18.1 release.

1.18.0:
DOC: added note to docstring of numpy.savez
BUG: Numpy scalar types sometimes have the same name
DOC: Improve axes shift description and example in np.tensordot
MAINT: avoid relying on `np.generic.__name__` in `np.dtype.name`
ENH: supply our version of numpy.pxd, requires cython>=0.29
BUG: General fixes to f2py reference counts (dereferencing)
BUG: NaT now sorts to ends of arrays
DOC: Updates to nditer usage instructions
BUG: Do not crash on recursive `.dtype` attribute lookup.
ENH: Use AVX for float32 implementation of np.sin & np.cos
DEP: Deprecate silent ignoring of bad data in fromfile/fromstring
ENH: Always produce a consistent shape in the result of `argwhere`
DOC: array(obj, dtype=dt) can downcast
DOC: Document ma.filled behavior with non-scalar fill_value
DOC: Add note to irfft-like functions about the default sizes
BUG: Don't produce undefined behavior for a << b if b >= bitsof(a)
MAINT: Update NEP template.
ENH: random: Add the multivariate hypergeometric distribution.
DOC: Fix unrendered links
MAINT: Rewrite Floyd algorithm
DOC: Add missing macros to C-API documentation
ENH: Add axis argument to random.permutation and random.shuffle
DOC: Adds documentation of functions exposed in numpy namespace
BUG: Refcount fixes
MAINT: Ensure array_dealloc does not modify refcount of self
MAINT: Prepare master for 1.18.0 development.
MAINT,BUG,DOC: Fix errors in _add_newdocs
MAINT: Remove an unnessary backslash between two string literals
MAINT: Update pavement to use python3 in shell commands.
MAINT: Remove unnecessary backslashes (and replace others by...
MAINT: Replace integers in places where booleans are expected
DOC: Add missing parameter description for keepdims in MaskedArray
ENH: use AVX for float32 and float64 implementation of sqrt,...
DOC: reformat top-level release index
DOC : Refactor Array API documentation -- Array Structure and...
DOC: Fix typo in "make_mask" documentation
MAINT: Delete unused _aliased_types.py
BLD: Remove Trusty dist in Travis CI build
BUG: Handle weird bytestrings in dtype()
ENH: use towncrier to build the release note
ENH: improve error message for ragged-array creation failure
DOC: Update the description of byteswap
BUG: i0 Bessel function regression on array-likes supporting...
ENH, BUILD: refactor all OpenBLAS downloads into a single, testable...
MAINT: Remove unnecessary parenthesis in numpy.ma.core
MAINT: Fix wrong spelling of ufunc
DOC: Remove explicit .next method calls with built-in next function...
DOC: Don't override MaskedArray.view documentation with the one...
BUG: Fix incorrect GIL release in array.nonzero
MAINT: Warn if `_add_newdocs.py` is used to add docstrings to...
MAINT: Revert 13876, "MAINT,BUG,DOC: Fix errors in _add_newdocs"
MAINT,BUG,DOC: Fix errors in _add_newdocs
DOC, MAINT: emphasize random API changes, remove Generator.randint
DOC: Add a numpy-doc docstring to add_newdoc
DOC: Fix rst rendering in data types
DOC:Update the description of set_printoptions in quickstart...
Fixing failure on Python 2.7 on Windows 7
Fix a typo related to the range of indices
DOC: add space between words across lines
BUG, DOC: add new recfunctions to `__all__`
DOC: Change (old) range() to np.arange()
DOC: improve np.sort docstring
DOC: spellcheck numpy/doc/broadcasting.py
MAINT, TST: remove test-installed-numpy.py
DOC: Document array_function at a higher level.
DOC: show workaround for backward compatibility
DOC: Add a call for contribution paragraph to the readme
BUG: Missing warnings import in polyutils
BUILD: adapt "make version-check" to "make dist"
DOC: emphasize need for matching numpy, git versions
TST, MAINT, BUG: expand OpenBLAS version checking
ENH: Chain exception for typed item assignment
MAINT: Fix spelling error in npy_tempita kwarg
DOC: Array API : Directory restructure and code cleanup
[DOC] Remove unused/deprecated functions
Update system_info.py
DOC:Link between the two indexing documentation pages
DOC: Update NumFOCUS subcommittee replacing Nathaniel with Sebastian
DOC: update "Contributing to NumPy" with more activities/roles
DOC: Improve quickstart documentation of new random Generator
DEP: Speed up WarnOnWrite deprecation in buffer interface
NEP: numpy.org website redesign
DOC: Fix docstring of numpy.allclose regarding NaNs
DEP: Raise warnings for deprecated functions PyArray_As1D, PyArray_As2D
DEP: Remove np.rank which has been deprecated for more than 5...
BUG, TEST: Adding validation test suite to validate float32 exp
ENH,DEP: Allow multiple axes in expand_dims
ENH: add pyproject.toml
DOC: Update cversions.py links and wording
DOC, BUILD: cleanups and fix (again) 'make dist'
BUG: Fix file-like object check when saving arrays
DOC: Resolve bad references in Sphinx warnings
MAINT: bump ARMv8 / POWER8 OpenBLAS in CI
DOC: Emphasize the need to run tests when building from source
DOC:Add example to clarify "numpy.save" behavior on already open...
DEP: Deprecate full and economic modes for linalg.qr
DOC: Doc release
BUG: fix build issue on icc 2016
TST: Add 3.8-dev to travisCI testing.
DOC: Add blank line above doctest for intersect1d
ENH: Propose standard policy for dropping support of old Python...
DOC: Use `pip install .` where possible instead of calling setup.py
MAINT: adjustments to test_ufunc_noncontigous
MAINT: Improve NEP template
DOC: fix documentation of i and j for tri.
MAINT: Lazy import testing on python >=3.7
DEP: Deprecate PyArray_FromDimsAndDataAndDescr, PyArray_FromDims
MAINT: Clearer error message while padding with stat_length=0
MAINT: remove duplicate variable assignments
BUG: initialize variable that is passed by pointer
DOC: fix typo in c-api/array.rst doc
BUG: Add gcd/lcm definitions to npy_math.h
MAINT: Mark umath accuracy test xfail.
MAINT: Use equality instead of identity check with literal
MAINT: Fix small typo in quickstart docs
DOC, MAINT: Update master after 1.17.0 release.
ENH: add c-imported modules for freeze analysis in np.random
BUG: Fix DeprecationWarning in python 3.8
BUG: Remove stray print that causes a SystemError on python 3.7...
BUG: Remove the broken clip wrapper
BUG: avx2_scalef_ps must be static
TST: Allow fuss in testing strided/non-strided exp/log loops
NEP: Proposal for __duckarray__ protocol
BUG: Make advanced indexing result on read-only subclass writeable
TST: Clean up of test_pocketfft.py
DEP: Deprecate np.alen
MAINT: Workaround for Intel compiler bug leading to failing test
DOC: Fix hermitian argument docs in `svd`
MAINT: Fix a docstring typo.
DOC: Fix links in `/.github/CONTRIBUTING.md`.
ENH: Multivariate normal speedups
MAINT: Improve mismatch message of np.testing.assert_array_equal
DOC,MAINT: Move towncrier files and fixup categories
BUG: Fixed default BitGenerator name
BUG: Fix uint-overflow if padding with linear_ramp and negative...
ENH: Enable huge pages in all Linux builds
BUG: Fix leak in the f2py-generated module init and `PyMem_Del`...
DOC: new nan_to_num keywords are from 1.17 onwards
TST: Add tests for deprecated C functions (PyArray_As1D, PyArray_As1D)
DOC: mention `take_along_axis` in `choose`
ENH: Parse complex number from string
DOC: update or remove outdated sourceforge links
MAINT: Better error message for norm
DOC: add backlinks to numpy.org
BUG: Don't fail when lexsorting some empty arrays.
BUG: Fix segfault in `random.permutation(x)` when x is a string.
Doc: fix a typo in NEP21
DOC: set status of NEP 28 (website redesign) to Accepted
BLD: MAINT: change default behavior of build flag appending.
BUG: Fixes StopIteration error from 'np.genfromtext' for empty...
BUG: fix inconsistent axes ordering for axis in function `unique`
DEP: Deprecate load/dump functions in favour of pickle methods
MAINT: Update NEP-30
DEP: Deprecate arrayprint formatting functions
DOC: remove scipy.org from the breadcrumb formattiong
BUG: Fix formatting error in exception message
DOC: Address typos in dispatch docs
BUG: Fix ZeroDivisionError for zero length arrays in pocketfft.
BUG: Fix misuse of .names and .fields in various places
TST, BUG: Use python3.6-dbg.
BUG: core: Handle large negative np.int64 args in binary_repr.
BUG: Fix numpy.random bug in platform detection
MAINT: random: Match type of SeedSequence.pool_size to DEFAULT_POOL_SIZE
Bug: Fix behavior of structured_to_unstructured on non-trivial...
DOC: add two commas, move one word
DOC: Clarify rules about broadcasting when empty arrays are involved.
TST, MAINT: bump to OpenBLAS 0.3.7 stable
DEP: numpy.testing.rand
DEP: Deprecate class `SafeEval`
BUG: revert detecting and raising error on ragged arrays
DOC: Improve documentation of `isscalar`.
MAINT: Fix bloated mismatch error percentage in array comparisons.
DOC: Fix a minor typo in dispatch documentation.
MAINT: Remove redundant deprecation checks
MAINT: polynomial: Add an N-d vander implementation used under...
DOC: clarify that PytestTester is non-public
DOC: support and require sphinx>=2.2
DOC: random: fix doc linking, was referencing private submodules.
MAINT: Fixes for prospective Python 3.10 and 4.0
DOC: lib: Add more explanation of the weighted average calculation.
MAINT: Avoid BytesWarning in PyArray_DescrConverter()
MAINT: Post NumPy 1.17.1 update.
DOC: Fixed dtype docs for var, nanvar.
DOC: Document project as Python 3 only with a trove classifier
BUILD: move all test dependencies to ./test_requirements.txt
BUG: lib: Fix histogram problem with signed integer arrays.
REL: Update master after NumPy 1.16.5 release.
BUG: test, fix regression in converting to ctypes
NEP: Add initial draft of NEP-31: Context-local and global overrides..
DOC: document numpy/doc update process
DOC: update np.around docstring with note about floating-point...
BUG: view with fieldless dtype should raise if itemsize != 0
DOC: fix issue with __new__ usage in subclassing doc.
DOC: Fix release notes table of contents
NEP 32: Remove the financial functions from NumPy
BLD: Update RELEASE_WALKTHROUGH and cythonize.
Bump pytest from 5.1.1 to 5.1.2
TST: Remove build job since we now use Dependabot
BLD: Only allow using Cython module when cythonizing.
TST: Add dependabot config file.
BUG: Fix format statement associated with AttributeError.
BUG: Fix aradixsort indirect indexing.
DOC: add the reference to 'printoptions'
BUG: Do not show Override module in private error classes.
DOC: Make implementation bullet points consistent in NEP 29
MAINT: Clarify policy language in NEP-29.
REL: Update master after 1.17.2 release.
MAINT: clean up pocketfft modules inside numpy.fft namespace
BLD: remove generated Cython files from sdist
MAINT: add test to prevent new public-looking modules being added
BUG: random.hypergeometic assumes npy_long is npy_int64, hangs...
ENH: Print the amount of memory that would be used by a failed...
MAINT: use test_requirements.txt in tox and shippable, ship it...
BUG: add a specialized loop for boolean matmul
BUG: Fix _ctypes class circular reference.
BUG: core: Fix the str function of the rational dtype.
DOC: add timedelta64 signature
MAINT: Extract raising of MemoryError to a helper function
BUG,MAINT: Some fixes and minor cleanup based on clang analysis
MAINT: Add `NPY_UNUSED` and `const` qualified suggested by clang
MAINT: Silence integer comparison build warnings in assert statements
MAINT: distutils: Add newline at the end of printed warnings.
BUG: random: Revert gh-14458 and refix gh-14557.
DOC: Fix reference NPY_ARRAY_OWNDATA instead of NPY_OWNDATA.
ENH: Allow NPY_PKG_CONFIG_PATH environment variable override
MAINT: remove the entropy c-extension module
DOC: Add backslashes so PyUFunc_FromFuncAndDataAndSignatureAndIdentity
DOC: Fix a minor typo in changelog readme
BUG: Fix randint when range is 2**32
DOC: tweak np.round docstring to clarify floating-point error
DOC: Add warning to NPV function
API: Do not return None from recfunctions.drop_fields
BUG: Fix flatten_dtype so that nested 0-field structs are flattened...
DOC: Build release notes during CircleCI step
BUILD: Hide platform configuration probe behind --debug-configure
Mention that split() returns views into the original array
MAINT: Simplify lookfor function
MAINT: random: Remove a few duplicated C function prototypes.
BUILD, MAINT: run tests with verbose for PyPY, also do not leak...
BUG: fix release snippet failures caught only after merging
BLD: add warn-error option, adds -Werror to compiler
BUG: random: Create a legacy implementation of random.binomial.
MAINT: remove unused functions, rearrange headers (from CC=clang)
DOC: Fix a bit of code in 'Beyond the Basics' C API user guide.
MAINT: Cleanup old_defines in DOC
DOC: Added missing versionadded to diff(prepend)
BUG: Avoid ctypes in Generators
Changing ImportWarning to DeprecationWarning
MAINT: handle case where GIT_VERSION is empty string
MAINT: core: Remove duplicated inner loop ee->e from log, exp,...
DOC: clarify input types in basics.io.genfromtxt.rst
DOC: remove note about Pocketfft license file (non-existing here).
DOC: Fix code that generates the table in the 'Casting Rules'...
MAINT: don't install partial numpy.random C/Cython API.
TST: ensure coercion tables aren't printed on failing public...
DEP: remove deprecated (and private) numpy.testing submodules.
BLD, DOC: fix gh-14518, add release note
BUG: importing build_src breaks setuptools monkeypatch for msvc14
DOC: Note runtests.py `-- -s` method to use pytests `-s`
DOC: update submodule docstrings, remove info.py files
DOC: Document the NPY_SCALARKIND values as C variables.
MAINT: Bump pytest from 5.1.2 to 5.1.3
DEP: remove deprecated select behaviour
BUG: Add missing check for 0-sized array in ravel_multi_index
BUG: dtype refcount cleanups
DOC: Fix a minor typo in changelog entry
MAINT: Fix typo: remoge → remove
DOC: Change the promotion table checkmark to 'Y'.
DEP: Complete deprecation of invalid array/memory order
DOC: Add to doc that interp cannot contain NaN
NEP: Accept NEP 32.
NEP: Fix discrepancies in NEPs
NEP: Only list "Active" NEPs under "Meta-NEPs"
API: restructure and document numpy.random C-API
BUG: properly define PyArray_DescrCheck{,Exact}
MAINT: Remove duplicate files from .gitignore
API: rearrange the cython files in numpy.random
MAINT: Bump pytest from 5.1.3 to 5.2.0
MAINT: Add "MAINT" tag to dependabot commit msg
DOC: Updated sphinx directive formatting
DEP: Finish deprecation of non-integer `num` in linspace
DOC: s/OR/AND/ in np.logical_and docstring
DOC: misleading np.sinc() documentation
DOC: clarify residual in np.polyfit
BUILD: change to build_src --verbose-cfg, runtests.py --debug-info
BUG: always free clean_sep
DOC: Create `class Extension` docstring and add it to documentation.
DOC: add `printoptions` as a context manager to `set_printoptions`
DOC: Fix typo in NEP 29
MAINT: Use scalar math power function directly
DOC: Add IPython to dependencies needed to build docs.
MAINT: Bump pytest-cov from 2.7.1 to 2.8.1
MAINT: Bump pytest from 5.2.0 to 5.2.1
MAINT: Bump pytz from 2019.2 to 2019.3
MAINT: Use `extract_unit` throughout datetime
BUG: fix fromfile behavior when reading sub-array dtypes
BUG: random: Use correct length when axis is given to shuffle.
BUG: Do not rely on undefined behaviour to cast from float to...
NEP: add default-dtype-object-deprecation nep 34
MAINT: Remove unused boolean negative/subtract loops
DEP: ufunc `out` argument must be a tuple for multiple outputs
BUG: Fix `np.einsum` errors on Power9 Linux and z/Linux
DOC: Note release notes process changes on devdocs start page
Doc warnings
DOC: Switch Markdown link to RST in NEP 29
TST: Divide Azure CI Pipelines into stages.
DEP: Finish the out kwarg deprecation for ufunc calls
DOC: Removing mentions of appveyor
BUG: Default start to 0 for timedelta arange
API: NaT (arg)min/max behavior
API: Forbid Q<->m safe casting
DEP: deprecate financial functions.
DOC: Move newsfragment to correct folder
DOC: cleaning up examples in maskedarray.generic
MAINT: umath: Change error message for unsupported bool subtraction.
ENH: Add complex number support for fromfile
TST: run refguide-check on rst files in doc/*
DOC: Edit NEP procedure for better discussion
DOC: Post 1.17.3 release update.
NEP: Accept NEP 29 as final
BUG: Don't narrow intp to int when producing error messages
DOC: lib: Fix deprecation markup in financial function docstrings.
DOC: Change from HTTP to HTTPS
BUG: clear only attribute errors in get_attr_string.h::maybe_get_attr
MAINT: doc: Remove doc/newdtype_example/
Reword cautionary note about dtype.descr
BUG: fix integer size confusion in handling array's ndmin argument
TST, BUILD: add a gcc 4.8 run on ubuntu 18.04
Update CLASSIFIERS with python 3.8 support
BUG: random: biased samples from integers() with 8 or 16 bit...
DOC: Add release note about changed random variate stream from...
DOC: Make changes to NEP procedure
DOC: random: Remove redundant 'See Also' entry in 'uniform' docstring.
MAINT: Minor typo fix
MAINT: Bump pytest from 5.2.1 to 5.2.2
DOC: Adjust NEP-31 to new template.
DEP: issue deprecation warning when creating ragged array (NEP...
NEP: move 'NEP 29 random' from Accepted to Final
DOC: Add take_along_axis to the see also section in argmin, argmax...
ENH: change object-array comparisons to prefer OO->O unfuncs
TST: Don't construct Fraction instances from numpy scalars
Rename helper functions to not use the word rank
MAINT: Use templating to merge float loops
BUILD: ignore more build.log warnings
BLD: Prevent -flto from optimising long double representation...
BUG: raise ValueError for empty arrays passed to _pyarray_correlate
MAINT: move buffer.h -> npy_buffer.h to avoid conflicts
MAINT: Bump cython from 0.29.13 to 0.29.14
ENH: add isinf, isnan, fmin, fmax loops for datetime64, timedelta64
BLD: add 'apt update' to shippable
MAINT: revert gh-14800, which gave precedence to OO->O over OO->?
REL: Update master after 1.17.4 release.
BUILD: remove SSE2 flag from numpy.random builds
DOC: Update NEP29 with Python3.8 informations.
BUG: Remove builtins from __all__
MAINT: Delete and ignore generated files
Update FUNDING.yml
MAINT: Remove uses of scalar aliases
NEP: move nep 34 to accepted
TST: Add s390x to the TravisCI test matrix.
DOC: Note FFT type promotion
TST: Test with Python3.8 on Windows.
TST: Update travis.yml
TST: add no_tracing decorator to refcount-sensitive codepath...
MAINT: Bump pytest from 5.2.2 to 5.2.4
BUG: Fix step returned by linspace when num=1 and endpoint=False
DOC: Compare 'tolist' function to 'list' in example
DOC: Clarify return type for default_rng
MAINT: move numpy/random/examples -> numpy/random/_examples
DOC: testing: Note handling of scalars in assert_array_equal...
DOC, API: add random.__init__.pxd and document random.* functions
DOC: Clean up examples of low-level random access
TST. API: test using distributions.h via cffi
TST: skip if cython is not available
MAINT: Cleaned up mintypecode for Py3
DOC: fix docstring of np.linalg.norm
MAINT: Added Python3.8 branch to dll lib discovery on Windows
DEV: update asv.conf.json
MAINT: Bump pytest from 5.2.4 to 5.3.0
MAINT: Fix typos
REV: "ENH: Improved performance of PyArray_FromAny for sequences...
BUG: warn when saving dtype with metadata
DEP: Deprecate the axis argument to masked_rows and masked_cols
MAINT: Fix long name of PCG64
DOC, API: improve the C-API/Cython documentation and interfaces...
DOC: Fix typo in numpy.loadtxt and numpy.genfromtxt documentation
ENH: allow using symbol-suffixed 64-bit BLAS/LAPACK for numpy.dot...
DOC: add a more useful comment to compat.py3k.py
DOC: lib: Use a clearer example of ddof in the notes of the cov...
TST: machinery for tests requiring large memory + lapack64 smoketest
MAINT: Only copy input array in _replace_nan() if there are nans...
MAINT: Bump pytest from 5.3.0 to 5.3.1
REV: "ENH: Improved performance of PyArray_FromAny for sequences...
REL: Prepare for 1.18 branch
MAINT: Cleaned up mintypecode for Py3 (pt. 2)
BUG: Fix refcounting in ufunc object loops
BUG: Exceptions tracebacks are dropped
REV: Revert "Merge pull request 14794 from mattip/nep-0034-impl"
API, DOC: change names to multivariate_hypergeometric, improve docs
REL: Prepare for NumPy 1.18.0 release.
TST: Check requires_memory immediately before the test
ENH: Add support to sort timedelta64 `NaT` to end of the array
MAINT: follow-up cleanup for blas64 PR
ENH: f2py: add --f2cmap option for specifying the name of .f2py_f2cmap
ENH: add support for ILP64 OpenBLAS (without symbol suffix)


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/math/py-numpy/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-numpy/buildlink3.mk
cvs rdiff -u -r1.47 -r1.48 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py \
    pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.63 pkgsrc/math/py-numpy/Makefile:1.64
--- pkgsrc/math/py-numpy/Makefile:1.63  Thu Jan 30 23:34:28 2020
+++ pkgsrc/math/py-numpy/Makefile       Mon Apr 27 17:00:35 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2020/01/30 23:34:28 minskim Exp $
+# $NetBSD: Makefile,v 1.64 2020/04/27 17:00:35 adam Exp $
 
-DISTNAME=      numpy-1.16.6
+DISTNAME=      numpy-1.18.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
@@ -19,6 +19,8 @@ MAKE_ENV+=            ATLAS=None
 
 REPLACE_PYTHON+=       *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # since 1.17
+
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
 

Index: pkgsrc/math/py-numpy/PLIST
diff -u pkgsrc/math/py-numpy/PLIST:1.27 pkgsrc/math/py-numpy/PLIST:1.28
--- pkgsrc/math/py-numpy/PLIST:1.27     Fri Jan 24 16:18:22 2020
+++ pkgsrc/math/py-numpy/PLIST  Mon Apr 27 17:00:35 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/01/24 16:18:22 minskim Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/04/27 17:00:35 adam Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PLIST.py2x}bin/f2py2
 ${PLIST.py3x}bin/f2py3
@@ -47,16 +47,18 @@ ${PYSITELIB}/numpy/core/__init__.pyo
 ${PYSITELIB}/numpy/core/_add_newdocs.py
 ${PYSITELIB}/numpy/core/_add_newdocs.pyc
 ${PYSITELIB}/numpy/core/_add_newdocs.pyo
-${PYSITELIB}/numpy/core/_aliased_types.py
-${PYSITELIB}/numpy/core/_aliased_types.pyc
-${PYSITELIB}/numpy/core/_aliased_types.pyo
+${PYSITELIB}/numpy/core/_asarray.py
+${PYSITELIB}/numpy/core/_asarray.pyc
+${PYSITELIB}/numpy/core/_asarray.pyo
 ${PYSITELIB}/numpy/core/_dtype.py
 ${PYSITELIB}/numpy/core/_dtype.pyc
 ${PYSITELIB}/numpy/core/_dtype.pyo
 ${PYSITELIB}/numpy/core/_dtype_ctypes.py
 ${PYSITELIB}/numpy/core/_dtype_ctypes.pyc
 ${PYSITELIB}/numpy/core/_dtype_ctypes.pyo
-${PYSITELIB}/numpy/core/_dummy.so
+${PYSITELIB}/numpy/core/_exceptions.py
+${PYSITELIB}/numpy/core/_exceptions.pyc
+${PYSITELIB}/numpy/core/_exceptions.pyo
 ${PYSITELIB}/numpy/core/_internal.py
 ${PYSITELIB}/numpy/core/_internal.pyc
 ${PYSITELIB}/numpy/core/_internal.pyo
@@ -74,6 +76,9 @@ ${PYSITELIB}/numpy/core/_struct_ufunc_te
 ${PYSITELIB}/numpy/core/_type_aliases.py
 ${PYSITELIB}/numpy/core/_type_aliases.pyc
 ${PYSITELIB}/numpy/core/_type_aliases.pyo
+${PYSITELIB}/numpy/core/_ufunc_config.py
+${PYSITELIB}/numpy/core/_ufunc_config.pyc
+${PYSITELIB}/numpy/core/_ufunc_config.pyo
 ${PYSITELIB}/numpy/core/_umath_tests.so
 ${PYSITELIB}/numpy/core/arrayprint.py
 ${PYSITELIB}/numpy/core/arrayprint.pyc
@@ -122,12 +127,11 @@ ${PYSITELIB}/numpy/core/include/numpy/np
 ${PYSITELIB}/numpy/core/include/numpy/numpyconfig.h
 ${PYSITELIB}/numpy/core/include/numpy/old_defines.h
 ${PYSITELIB}/numpy/core/include/numpy/oldnumeric.h
+${PYSITELIB}/numpy/core/include/numpy/random/bitgen.h
+${PYSITELIB}/numpy/core/include/numpy/random/distributions.h
 ${PYSITELIB}/numpy/core/include/numpy/ufunc_api.txt
 ${PYSITELIB}/numpy/core/include/numpy/ufuncobject.h
 ${PYSITELIB}/numpy/core/include/numpy/utils.h
-${PYSITELIB}/numpy/core/info.py
-${PYSITELIB}/numpy/core/info.pyc
-${PYSITELIB}/numpy/core/info.pyo
 ${PYSITELIB}/numpy/core/lib/libnpymath.a
 ${PYSITELIB}/numpy/core/lib/npy-pkg-config/mlib.ini
 ${PYSITELIB}/numpy/core/lib/npy-pkg-config/npymath.ini
@@ -165,6 +169,12 @@ ${PYSITELIB}/numpy/core/tests/__init__.p
 ${PYSITELIB}/numpy/core/tests/_locales.py
 ${PYSITELIB}/numpy/core/tests/data/astype_copy.pkl
 ${PYSITELIB}/numpy/core/tests/data/recarray_from_file.fits
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-README
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-cos
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-exp
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-log
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-sin
+${PYSITELIB}/numpy/core/tests/test__exceptions.py
 ${PYSITELIB}/numpy/core/tests/test_abc.py
 ${PYSITELIB}/numpy/core/tests/test_api.py
 ${PYSITELIB}/numpy/core/tests/test_arrayprint.py
@@ -180,6 +190,7 @@ ${PYSITELIB}/numpy/core/tests/test_getli
 ${PYSITELIB}/numpy/core/tests/test_half.py
 ${PYSITELIB}/numpy/core/tests/test_indexerrors.py
 ${PYSITELIB}/numpy/core/tests/test_indexing.py
+${PYSITELIB}/numpy/core/tests/test_issue14735.py
 ${PYSITELIB}/numpy/core/tests/test_item_selection.py
 ${PYSITELIB}/numpy/core/tests/test_longdouble.py
 ${PYSITELIB}/numpy/core/tests/test_machar.py
@@ -194,6 +205,7 @@ ${PYSITELIB}/numpy/core/tests/test_print
 ${PYSITELIB}/numpy/core/tests/test_records.py
 ${PYSITELIB}/numpy/core/tests/test_regression.py
 ${PYSITELIB}/numpy/core/tests/test_scalar_ctors.py
+${PYSITELIB}/numpy/core/tests/test_scalar_methods.py
 ${PYSITELIB}/numpy/core/tests/test_scalarbuffer.py
 ${PYSITELIB}/numpy/core/tests/test_scalarinherit.py
 ${PYSITELIB}/numpy/core/tests/test_scalarmath.py
@@ -201,6 +213,7 @@ ${PYSITELIB}/numpy/core/tests/test_scala
 ${PYSITELIB}/numpy/core/tests/test_shape_base.py
 ${PYSITELIB}/numpy/core/tests/test_ufunc.py
 ${PYSITELIB}/numpy/core/tests/test_umath.py
+${PYSITELIB}/numpy/core/tests/test_umath_accuracy.py
 ${PYSITELIB}/numpy/core/tests/test_umath_complex.py
 ${PYSITELIB}/numpy/core/tests/test_unicode.py
 ${PYSITELIB}/numpy/core/umath.py
@@ -218,9 +231,6 @@ ${PYSITELIB}/numpy/distutils/__config__.
 ${PYSITELIB}/numpy/distutils/__init__.py
 ${PYSITELIB}/numpy/distutils/__init__.pyc
 ${PYSITELIB}/numpy/distutils/__init__.pyo
-${PYSITELIB}/numpy/distutils/__version__.py
-${PYSITELIB}/numpy/distutils/__version__.pyc
-${PYSITELIB}/numpy/distutils/__version__.pyo
 ${PYSITELIB}/numpy/distutils/_shell_utils.py
 ${PYSITELIB}/numpy/distutils/_shell_utils.pyc
 ${PYSITELIB}/numpy/distutils/_shell_utils.pyo
@@ -353,9 +363,6 @@ ${PYSITELIB}/numpy/distutils/fcompiler/v
 ${PYSITELIB}/numpy/distutils/from_template.py
 ${PYSITELIB}/numpy/distutils/from_template.pyc
 ${PYSITELIB}/numpy/distutils/from_template.pyo
-${PYSITELIB}/numpy/distutils/info.py
-${PYSITELIB}/numpy/distutils/info.pyc
-${PYSITELIB}/numpy/distutils/info.pyo
 ${PYSITELIB}/numpy/distutils/intelccompiler.py
 ${PYSITELIB}/numpy/distutils/intelccompiler.pyc
 ${PYSITELIB}/numpy/distutils/intelccompiler.pyo
@@ -403,6 +410,7 @@ ${PYSITELIB}/numpy/distutils/tests/test_
 ${PYSITELIB}/numpy/distutils/tests/test_fcompiler_intel.py
 ${PYSITELIB}/numpy/distutils/tests/test_fcompiler_nagfor.py
 ${PYSITELIB}/numpy/distutils/tests/test_from_template.py
+${PYSITELIB}/numpy/distutils/tests/test_mingw32ccompiler.py
 ${PYSITELIB}/numpy/distutils/tests/test_misc_util.py
 ${PYSITELIB}/numpy/distutils/tests/test_npy_pkg_config.py
 ${PYSITELIB}/numpy/distutils/tests/test_shell_utils.py
@@ -497,9 +505,6 @@ ${PYSITELIB}/numpy/f2py/f90mod_rules.pyo
 ${PYSITELIB}/numpy/f2py/func2subr.py
 ${PYSITELIB}/numpy/f2py/func2subr.pyc
 ${PYSITELIB}/numpy/f2py/func2subr.pyo
-${PYSITELIB}/numpy/f2py/info.py
-${PYSITELIB}/numpy/f2py/info.pyc
-${PYSITELIB}/numpy/f2py/info.pyo
 ${PYSITELIB}/numpy/f2py/rules.py
 ${PYSITELIB}/numpy/f2py/rules.pyc
 ${PYSITELIB}/numpy/f2py/rules.pyo
@@ -554,22 +559,19 @@ ${PYSITELIB}/numpy/f2py/use_rules.pyo
 ${PYSITELIB}/numpy/fft/__init__.py
 ${PYSITELIB}/numpy/fft/__init__.pyc
 ${PYSITELIB}/numpy/fft/__init__.pyo
-${PYSITELIB}/numpy/fft/fftpack.py
-${PYSITELIB}/numpy/fft/fftpack.pyc
-${PYSITELIB}/numpy/fft/fftpack.pyo
-${PYSITELIB}/numpy/fft/fftpack_lite.so
+${PYSITELIB}/numpy/fft/_pocketfft.py
+${PYSITELIB}/numpy/fft/_pocketfft.pyc
+${PYSITELIB}/numpy/fft/_pocketfft.pyo
+${PYSITELIB}/numpy/fft/_pocketfft_internal.so
 ${PYSITELIB}/numpy/fft/helper.py
 ${PYSITELIB}/numpy/fft/helper.pyc
 ${PYSITELIB}/numpy/fft/helper.pyo
-${PYSITELIB}/numpy/fft/info.py
-${PYSITELIB}/numpy/fft/info.pyc
-${PYSITELIB}/numpy/fft/info.pyo
 ${PYSITELIB}/numpy/fft/setup.py
 ${PYSITELIB}/numpy/fft/setup.pyc
 ${PYSITELIB}/numpy/fft/setup.pyo
 ${PYSITELIB}/numpy/fft/tests/__init__.py
-${PYSITELIB}/numpy/fft/tests/test_fftpack.py
 ${PYSITELIB}/numpy/fft/tests/test_helper.py
+${PYSITELIB}/numpy/fft/tests/test_pocketfft.py
 ${PYSITELIB}/numpy/lib/__init__.py
 ${PYSITELIB}/numpy/lib/__init__.pyc
 ${PYSITELIB}/numpy/lib/__init__.pyo
@@ -606,9 +608,6 @@ ${PYSITELIB}/numpy/lib/histograms.pyo
 ${PYSITELIB}/numpy/lib/index_tricks.py
 ${PYSITELIB}/numpy/lib/index_tricks.pyc
 ${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
@@ -686,9 +685,6 @@ ${PYSITELIB}/numpy/linalg/__init__.py
 ${PYSITELIB}/numpy/linalg/__init__.pyc
 ${PYSITELIB}/numpy/linalg/__init__.pyo
 ${PYSITELIB}/numpy/linalg/_umath_linalg.so
-${PYSITELIB}/numpy/linalg/info.py
-${PYSITELIB}/numpy/linalg/info.pyc
-${PYSITELIB}/numpy/linalg/info.pyo
 ${PYSITELIB}/numpy/linalg/lapack_lite.so
 ${PYSITELIB}/numpy/linalg/linalg.py
 ${PYSITELIB}/numpy/linalg/linalg.pyc
@@ -733,9 +729,6 @@ ${PYSITELIB}/numpy/ma/testutils.pyo
 ${PYSITELIB}/numpy/ma/timer_comparison.py
 ${PYSITELIB}/numpy/ma/timer_comparison.pyc
 ${PYSITELIB}/numpy/ma/timer_comparison.pyo
-${PYSITELIB}/numpy/ma/version.py
-${PYSITELIB}/numpy/ma/version.pyc
-${PYSITELIB}/numpy/ma/version.pyo
 ${PYSITELIB}/numpy/matlib.py
 ${PYSITELIB}/numpy/matlib.pyc
 ${PYSITELIB}/numpy/matlib.pyo
@@ -796,20 +789,55 @@ ${PYSITELIB}/numpy/polynomial/tests/test
 ${PYSITELIB}/numpy/polynomial/tests/test_polynomial.py
 ${PYSITELIB}/numpy/polynomial/tests/test_polyutils.py
 ${PYSITELIB}/numpy/polynomial/tests/test_printing.py
+${PYSITELIB}/numpy/random/__init__.pxd
 ${PYSITELIB}/numpy/random/__init__.py
 ${PYSITELIB}/numpy/random/__init__.pyc
 ${PYSITELIB}/numpy/random/__init__.pyo
-${PYSITELIB}/numpy/random/info.py
-${PYSITELIB}/numpy/random/info.pyc
-${PYSITELIB}/numpy/random/info.pyo
+${PYSITELIB}/numpy/random/_bit_generator.pxd
+${PYSITELIB}/numpy/random/_bit_generator.so
+${PYSITELIB}/numpy/random/_bounded_integers.pxd
+${PYSITELIB}/numpy/random/_bounded_integers.so
+${PYSITELIB}/numpy/random/_common.pxd
+${PYSITELIB}/numpy/random/_common.so
+${PYSITELIB}/numpy/random/_examples/cffi/extending.py
+${PYSITELIB}/numpy/random/_examples/cffi/parse.py
+${PYSITELIB}/numpy/random/_examples/cython/extending.pyx
+${PYSITELIB}/numpy/random/_examples/cython/extending_distributions.pyx
+${PYSITELIB}/numpy/random/_examples/cython/setup.py
+${PYSITELIB}/numpy/random/_examples/numba/extending.py
+${PYSITELIB}/numpy/random/_examples/numba/extending_distributions.py
+${PYSITELIB}/numpy/random/_generator.so
+${PYSITELIB}/numpy/random/_mt19937.so
+${PYSITELIB}/numpy/random/_pcg64.so
+${PYSITELIB}/numpy/random/_philox.so
+${PYSITELIB}/numpy/random/_pickle.py
+${PYSITELIB}/numpy/random/_pickle.pyc
+${PYSITELIB}/numpy/random/_pickle.pyo
+${PYSITELIB}/numpy/random/_sfc64.so
 ${PYSITELIB}/numpy/random/mtrand.so
-${PYSITELIB}/numpy/random/randomkit.h
 ${PYSITELIB}/numpy/random/setup.py
 ${PYSITELIB}/numpy/random/setup.pyc
 ${PYSITELIB}/numpy/random/setup.pyo
 ${PYSITELIB}/numpy/random/tests/__init__.py
+${PYSITELIB}/numpy/random/tests/data/__init__.py
+${PYSITELIB}/numpy/random/tests/data/mt19937-testset-1.csv
+${PYSITELIB}/numpy/random/tests/data/mt19937-testset-2.csv
+${PYSITELIB}/numpy/random/tests/data/pcg64-testset-1.csv
+${PYSITELIB}/numpy/random/tests/data/pcg64-testset-2.csv
+${PYSITELIB}/numpy/random/tests/data/philox-testset-1.csv
+${PYSITELIB}/numpy/random/tests/data/philox-testset-2.csv
+${PYSITELIB}/numpy/random/tests/data/sfc64-testset-1.csv
+${PYSITELIB}/numpy/random/tests/data/sfc64-testset-2.csv
+${PYSITELIB}/numpy/random/tests/test_direct.py
+${PYSITELIB}/numpy/random/tests/test_extending.py
+${PYSITELIB}/numpy/random/tests/test_generator_mt19937.py
+${PYSITELIB}/numpy/random/tests/test_generator_mt19937_regressions.py
 ${PYSITELIB}/numpy/random/tests/test_random.py
+${PYSITELIB}/numpy/random/tests/test_randomstate.py
+${PYSITELIB}/numpy/random/tests/test_randomstate_regression.py
 ${PYSITELIB}/numpy/random/tests/test_regression.py
+${PYSITELIB}/numpy/random/tests/test_seed_sequence.py
+${PYSITELIB}/numpy/random/tests/test_smoke.py
 ${PYSITELIB}/numpy/setup.py
 ${PYSITELIB}/numpy/setup.pyc
 ${PYSITELIB}/numpy/setup.pyo
@@ -834,15 +862,6 @@ ${PYSITELIB}/numpy/testing/_private/para
 ${PYSITELIB}/numpy/testing/_private/utils.py
 ${PYSITELIB}/numpy/testing/_private/utils.pyc
 ${PYSITELIB}/numpy/testing/_private/utils.pyo
-${PYSITELIB}/numpy/testing/decorators.py
-${PYSITELIB}/numpy/testing/decorators.pyc
-${PYSITELIB}/numpy/testing/decorators.pyo
-${PYSITELIB}/numpy/testing/noseclasses.py
-${PYSITELIB}/numpy/testing/noseclasses.pyc
-${PYSITELIB}/numpy/testing/noseclasses.pyo
-${PYSITELIB}/numpy/testing/nosetester.py
-${PYSITELIB}/numpy/testing/nosetester.pyc
-${PYSITELIB}/numpy/testing/nosetester.pyo
 ${PYSITELIB}/numpy/testing/print_coercion_tables.py
 ${PYSITELIB}/numpy/testing/print_coercion_tables.pyc
 ${PYSITELIB}/numpy/testing/print_coercion_tables.pyo

Index: pkgsrc/math/py-numpy/buildlink3.mk
diff -u pkgsrc/math/py-numpy/buildlink3.mk:1.4 pkgsrc/math/py-numpy/buildlink3.mk:1.5
--- pkgsrc/math/py-numpy/buildlink3.mk:1.4      Fri Feb 28 09:43:10 2014
+++ pkgsrc/math/py-numpy/buildlink3.mk  Mon Apr 27 17:00:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/28 09:43:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/04/27 17:00:35 adam Exp $
 
 BUILDLINK_TREE+=       py-numpy
 
@@ -8,7 +8,11 @@ PY_NUMPY_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-numpy+=       ${PYPKGPREFIX}-numpy>=1.0
+.if ${_PYTHON_VERSION} == 27
+BUILDLINK_PKGSRCDIR.py-numpy?=         ../../math/py-numpy16
+.else
 BUILDLINK_PKGSRCDIR.py-numpy?=         ../../math/py-numpy
+.endif
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.47 pkgsrc/math/py-numpy/distinfo:1.48
--- pkgsrc/math/py-numpy/distinfo:1.47  Thu Mar 26 08:33:35 2020
+++ pkgsrc/math/py-numpy/distinfo       Mon Apr 27 17:00:35 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.47 2020/03/26 08:33:35 jperkin Exp $
+$NetBSD: distinfo,v 1.48 2020/04/27 17:00:35 adam Exp $
 
-SHA1 (numpy-1.16.6.zip) = 99bc8b723639066168cca0c9a3b68c36c73bddc2
-RMD160 (numpy-1.16.6.zip) = af2c5ec5956986b061a5cf067de5685098b6846f
-SHA512 (numpy-1.16.6.zip) = c219841cc804c194a38b8e046b83265b8b7a35be8f33d68561ef17b085465dd11bd1e84fe1baea809af0efb09a9b13283f13728d125fcdd2221c30ec23fd0a50
-Size (numpy-1.16.6.zip) = 5143340 bytes
+SHA1 (numpy-1.18.3.zip) = 8a149a93c00eca3fa0a66985bf8f7ee9549e216f
+RMD160 (numpy-1.18.3.zip) = 87df6a185a7f0214ce7f209662cf215ac8f534ae
+SHA512 (numpy-1.18.3.zip) = afb14dec81ade556e10b7de372e9d7b01b4bf246609c5eea26ad76ce93e6d9caa95479ae70dbfb725f28ac4802f94203c92e1e991852d2866b5225fc9d68e68d
+Size (numpy-1.18.3.zip) = 5435268 bytes
 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 893b0556f869543074cb74d5d4385d2f155004ec
-SHA1 (patch-numpy_distutils_system__info.py) = dfd88a140b65a66c222a95ea4be6f20a33702e3b
-SHA1 (patch-numpy_linalg_lapack__litemodule.c) = b421455fdbb666c8075d8bffbeb59533434d23e6
+SHA1 (patch-numpy_distutils_system__info.py) = ca5bd3b70c2c6d9178ab92b2432dd8734a5923a7
+SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8

Index: pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.1 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.2
--- pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.1      Tue Apr  3 18:30:45 2018
+++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py  Mon Apr 27 17:00:35 2020
@@ -1,30 +1,21 @@
-$NetBSD: patch-numpy_distutils_system__info.py,v 1.1 2018/04/03 18:30:45 minskim Exp $
+$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/04/27 17:00:35 adam Exp $
 
 Disable openblas detection.  In pkgsrc, py-numpy should use math/blas.
 
---- numpy/distutils/system_info.py.orig        2018-04-02 21:18:11.535155000 +0000
+--- numpy/distutils/system_info.py.orig        2020-04-19 08:51:58.000000000 +0000
 +++ numpy/distutils/system_info.py
-@@ -1531,12 +1531,12 @@ class lapack_opt_info(system_info):
-             self.set_info(**lapack_mkl_info)
-             return
+@@ -1644,14 +1644,6 @@ class lapack_opt_info(system_info):
+         return False
  
--        openblas_info = get_info('openblas_lapack')
-+        openblas_info = None
-         if openblas_info:
-             self.set_info(**openblas_info)
-             return
+     def _calc_info_openblas(self):
+-        info = get_info('openblas_lapack')
+-        if info:
+-            self.set_info(**info)
+-            return True
+-        info = get_info('openblas_clapack')
+-        if info:
+-            self.set_info(**info)
+-            return True
+         return False
  
--        openblas_info = get_info('openblas_clapack')
-+        openblas_info = None
-         if openblas_info:
-             self.set_info(**openblas_info)
-             return
-@@ -1642,7 +1642,7 @@ class blas_opt_info(system_info):
-             self.set_info(**blis_info)
-             return
- 
--        openblas_info = get_info('openblas')
-+        openblas_info = None
-         if openblas_info:
-             self.set_info(**openblas_info)
-             return
+     def _calc_info_flame(self):
Index: pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c:1.1 pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c:1.2
--- pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c:1.1    Fri Feb  1 09:24:25 2019
+++ pkgsrc/math/py-numpy/patches/patch-numpy_linalg_lapack__litemodule.c        Mon Apr 27 17:00:35 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-numpy_linalg_lapack__litemodule.c,v 1.1 2019/02/01 09:24:25 adam Exp $
+$NetBSD: patch-numpy_linalg_lapack__litemodule.c,v 1.2 2020/04/27 17:00:35 adam Exp $
 
 Add function definition for FNAME(MAIN_).
 
---- numpy/linalg/lapack_litemodule.c.orig      2015-04-16 14:14:55.000000000 +0000
+--- numpy/linalg/lapack_litemodule.c.orig      2020-04-19 08:51:58.000000000 +0000
 +++ numpy/linalg/lapack_litemodule.c
-@@ -17,6 +17,8 @@ typedef struct { float r, i; } f2c_compl
+@@ -37,6 +37,8 @@ typedef struct { float r, i; } f2c_compl
  typedef struct { double r, i; } f2c_doublecomplex;
  /* typedef long int (*L_fp)(); */
  
 +int FNAME(MAIN_)() { return 0; }
 +
- extern int FNAME(dgelsd)(int *m, int *n, int *nrhs,
-                           double a[], int *lda, double b[], int *ldb,
-                           double s[], double *rcond, int *rank,
+ extern fortran_int FNAME(dgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs,
+                           double a[], fortran_int *lda, double b[], fortran_int *ldb,
+                           double s[], double *rcond, fortran_int *rank,

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index