py-numpy: updated to 1.21.3

1.21.0

New functions

Add PCG64DXSM BitGenerator

Deprecations

The .dtype attribute must return a dtype
Inexact matches for numpy.convolve and numpy.correlate are deprecated
np.typeDict has been formally deprecated
Exceptions will be raised during array-like creation
Four ndarray.ctypes methods have been deprecated

Expired deprecations

Remove deprecated PolyBase and unused PolyError and PolyDomainError

Compatibility notes

Error type changes in universal functions
__array_ufunc__ argument validation
__array_ufunc__ and additional positional arguments
Validate input values in Generator.uniform
/usr/include removed from default include paths
Changes to comparisons with dtype=...
Changes to dtype and signature arguments in ufuncs
Ufunc signature=... and dtype= generalization and casting
Distutils forces strict floating point model on clang

C API changes

Use of ufunc->type_resolver and “type tuple”

New Features

Added a mypy plugin for handling platform-specific numpy.number precisions
Let the mypy plugin manage extended-precision numpy.number subclasses
New min_digits argument for printing float values
f2py now recognizes Fortran abstract interface blocks
BLAS and LAPACK configuration via environment variables
A runtime-subcriptable alias has been added for ndarray

Improvements

Arbitrary period option for numpy.unwrap
np.unique now returns single NaN
Generator.rayleigh and Generator.geometric performance improved
Placeholder annotations have been improved
Performance improvements
Improved performance in integer division of NumPy arrays
Improve performance of np.save and np.load for small arrays

Changes

numpy.piecewise output class now matches the input class
Enable Accelerate Framework

4 files changed, 128 insertions, 109 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index ee20ff1df93..38c9bb3d91c 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.83 2021/06/29 08:41:59 nia Exp $
+# $NetBSD: Makefile,v 1.84 2021/11/02 18:48:28 adam Exp $
 
-DISTNAME=	numpy-1.20.3
+DISTNAME=	numpy-1.21.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/numpy/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.numpy.org/
+HOMEPAGE=	https://www.numpy.org/
 COMMENT=	Array processing for numbers, strings, records, and objects
 LICENSE=	modified-bsd
 
diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST
index fd8455fb837..dd23fff92f8 100644
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2021/05/03 17:15:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2021/11/02 18:48:28 adam Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PLIST.py2x}bin/f2py2
 ${PLIST.py3x}bin/f2py3
@@ -27,6 +27,9 @@ ${PYSITELIB}/numpy/_globals.pyo
 ${PYSITELIB}/numpy/_pytesttester.py
 ${PYSITELIB}/numpy/_pytesttester.pyc
 ${PYSITELIB}/numpy/_pytesttester.pyo
+${PYSITELIB}/numpy/_version.py
+${PYSITELIB}/numpy/_version.pyc
+${PYSITELIB}/numpy/_version.pyo
 ${PYSITELIB}/numpy/char.pyi
 ${PYSITELIB}/numpy/compat/__init__.py
 ${PYSITELIB}/numpy/compat/__init__.pyc
@@ -99,6 +102,7 @@ ${PYSITELIB}/numpy/core/_ufunc_config.pyo
 ${PYSITELIB}/numpy/core/_umath_tests.so
 ${PYSITELIB}/numpy/core/arrayprint.py
 ${PYSITELIB}/numpy/core/arrayprint.pyc
+${PYSITELIB}/numpy/core/arrayprint.pyi
 ${PYSITELIB}/numpy/core/arrayprint.pyo
 ${PYSITELIB}/numpy/core/cversions.py
 ${PYSITELIB}/numpy/core/cversions.pyc
@@ -108,6 +112,7 @@ ${PYSITELIB}/numpy/core/defchararray.pyc
 ${PYSITELIB}/numpy/core/defchararray.pyo
 ${PYSITELIB}/numpy/core/einsumfunc.py
 ${PYSITELIB}/numpy/core/einsumfunc.pyc
+${PYSITELIB}/numpy/core/einsumfunc.pyi
 ${PYSITELIB}/numpy/core/einsumfunc.pyo
 ${PYSITELIB}/numpy/core/fromnumeric.py
 ${PYSITELIB}/numpy/core/fromnumeric.pyc
@@ -130,6 +135,8 @@ ${PYSITELIB}/numpy/core/include/numpy/_numpyconfig.h
 ${PYSITELIB}/numpy/core/include/numpy/arrayobject.h
 ${PYSITELIB}/numpy/core/include/numpy/arrayscalars.h
 ${PYSITELIB}/numpy/core/include/numpy/halffloat.h
+${PYSITELIB}/numpy/core/include/numpy/libdivide/LICENSE.txt
+${PYSITELIB}/numpy/core/include/numpy/libdivide/libdivide.h
 ${PYSITELIB}/numpy/core/include/numpy/multiarray_api.txt
 ${PYSITELIB}/numpy/core/include/numpy/ndarrayobject.h
 ${PYSITELIB}/numpy/core/include/numpy/ndarraytypes.h
@@ -195,11 +202,11 @@ ${PYSITELIB}/numpy/core/tests/_locales.pyc
 ${PYSITELIB}/numpy/core/tests/_locales.pyo
 ${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/data/umath-validation-set-README.txt
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-cos.csv
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-exp.csv
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-log.csv
+${PYSITELIB}/numpy/core/tests/data/umath-validation-set-sin.csv
 ${PYSITELIB}/numpy/core/tests/examples/checks.pyx
 ${PYSITELIB}/numpy/core/tests/examples/setup.py
 ${PYSITELIB}/numpy/core/tests/test__exceptions.py
@@ -211,9 +218,15 @@ ${PYSITELIB}/numpy/core/tests/test_abc.pyo
 ${PYSITELIB}/numpy/core/tests/test_api.py
 ${PYSITELIB}/numpy/core/tests/test_api.pyc
 ${PYSITELIB}/numpy/core/tests/test_api.pyo
+${PYSITELIB}/numpy/core/tests/test_argparse.py
+${PYSITELIB}/numpy/core/tests/test_argparse.pyc
+${PYSITELIB}/numpy/core/tests/test_argparse.pyo
 ${PYSITELIB}/numpy/core/tests/test_array_coercion.py
 ${PYSITELIB}/numpy/core/tests/test_array_coercion.pyc
 ${PYSITELIB}/numpy/core/tests/test_array_coercion.pyo
+${PYSITELIB}/numpy/core/tests/test_arraymethod.py
+${PYSITELIB}/numpy/core/tests/test_arraymethod.pyc
+${PYSITELIB}/numpy/core/tests/test_arraymethod.pyo
 ${PYSITELIB}/numpy/core/tests/test_arrayprint.py
 ${PYSITELIB}/numpy/core/tests/test_arrayprint.pyc
 ${PYSITELIB}/numpy/core/tests/test_arrayprint.pyo
@@ -412,6 +425,7 @@ ${PYSITELIB}/numpy/distutils/checks/cpu_xop.c
 ${PYSITELIB}/numpy/distutils/checks/extra_avx512bw_mask.c
 ${PYSITELIB}/numpy/distutils/checks/extra_avx512dq_mask.c
 ${PYSITELIB}/numpy/distutils/checks/extra_avx512f_reduce.c
+${PYSITELIB}/numpy/distutils/checks/extra_vsx_asm.c
 ${PYSITELIB}/numpy/distutils/checks/test_flags.c
 ${PYSITELIB}/numpy/distutils/command/__init__.py
 ${PYSITELIB}/numpy/distutils/command/__init__.pyc
@@ -642,7 +656,6 @@ ${PYSITELIB}/numpy/doc/ufuncs.pyo
 ${PYSITELIB}/numpy/dual.py
 ${PYSITELIB}/numpy/dual.pyc
 ${PYSITELIB}/numpy/dual.pyo
-${PYSITELIB}/numpy/emath.pyi
 ${PYSITELIB}/numpy/f2py/__init__.py
 ${PYSITELIB}/numpy/f2py/__init__.pyc
 ${PYSITELIB}/numpy/f2py/__init__.pyi
@@ -718,6 +731,9 @@ ${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_abstract_interface.py
+${PYSITELIB}/numpy/f2py/tests/test_abstract_interface.pyc
+${PYSITELIB}/numpy/f2py/tests/test_abstract_interface.pyo
 ${PYSITELIB}/numpy/f2py/tests/test_array_from_pyobj.py
 ${PYSITELIB}/numpy/f2py/tests/test_array_from_pyobj.pyc
 ${PYSITELIB}/numpy/f2py/tests/test_array_from_pyobj.pyo
@@ -822,54 +838,69 @@ ${PYSITELIB}/numpy/lib/_iotools.pyc
 ${PYSITELIB}/numpy/lib/_iotools.pyo
 ${PYSITELIB}/numpy/lib/_version.py
 ${PYSITELIB}/numpy/lib/_version.pyc
+${PYSITELIB}/numpy/lib/_version.pyi
 ${PYSITELIB}/numpy/lib/_version.pyo
 ${PYSITELIB}/numpy/lib/arraypad.py
 ${PYSITELIB}/numpy/lib/arraypad.pyc
+${PYSITELIB}/numpy/lib/arraypad.pyi
 ${PYSITELIB}/numpy/lib/arraypad.pyo
 ${PYSITELIB}/numpy/lib/arraysetops.py
 ${PYSITELIB}/numpy/lib/arraysetops.pyc
+${PYSITELIB}/numpy/lib/arraysetops.pyi
 ${PYSITELIB}/numpy/lib/arraysetops.pyo
 ${PYSITELIB}/numpy/lib/arrayterator.py
 ${PYSITELIB}/numpy/lib/arrayterator.pyc
+${PYSITELIB}/numpy/lib/arrayterator.pyi
 ${PYSITELIB}/numpy/lib/arrayterator.pyo
 ${PYSITELIB}/numpy/lib/format.py
 ${PYSITELIB}/numpy/lib/format.pyc
+${PYSITELIB}/numpy/lib/format.pyi
 ${PYSITELIB}/numpy/lib/format.pyo
 ${PYSITELIB}/numpy/lib/function_base.py
 ${PYSITELIB}/numpy/lib/function_base.pyc
+${PYSITELIB}/numpy/lib/function_base.pyi
 ${PYSITELIB}/numpy/lib/function_base.pyo
 ${PYSITELIB}/numpy/lib/histograms.py
 ${PYSITELIB}/numpy/lib/histograms.pyc
+${PYSITELIB}/numpy/lib/histograms.pyi
 ${PYSITELIB}/numpy/lib/histograms.pyo
 ${PYSITELIB}/numpy/lib/index_tricks.py
 ${PYSITELIB}/numpy/lib/index_tricks.pyc
+${PYSITELIB}/numpy/lib/index_tricks.pyi
 ${PYSITELIB}/numpy/lib/index_tricks.pyo
 ${PYSITELIB}/numpy/lib/mixins.py
 ${PYSITELIB}/numpy/lib/mixins.pyc
+${PYSITELIB}/numpy/lib/mixins.pyi
 ${PYSITELIB}/numpy/lib/mixins.pyo
 ${PYSITELIB}/numpy/lib/nanfunctions.py
 ${PYSITELIB}/numpy/lib/nanfunctions.pyc
+${PYSITELIB}/numpy/lib/nanfunctions.pyi
 ${PYSITELIB}/numpy/lib/nanfunctions.pyo
 ${PYSITELIB}/numpy/lib/npyio.py
 ${PYSITELIB}/numpy/lib/npyio.pyc
+${PYSITELIB}/numpy/lib/npyio.pyi
 ${PYSITELIB}/numpy/lib/npyio.pyo
 ${PYSITELIB}/numpy/lib/polynomial.py
 ${PYSITELIB}/numpy/lib/polynomial.pyc
+${PYSITELIB}/numpy/lib/polynomial.pyi
 ${PYSITELIB}/numpy/lib/polynomial.pyo
 ${PYSITELIB}/numpy/lib/recfunctions.py
 ${PYSITELIB}/numpy/lib/recfunctions.pyc
 ${PYSITELIB}/numpy/lib/recfunctions.pyo
 ${PYSITELIB}/numpy/lib/scimath.py
 ${PYSITELIB}/numpy/lib/scimath.pyc
+${PYSITELIB}/numpy/lib/scimath.pyi
 ${PYSITELIB}/numpy/lib/scimath.pyo
 ${PYSITELIB}/numpy/lib/setup.py
 ${PYSITELIB}/numpy/lib/setup.pyc
 ${PYSITELIB}/numpy/lib/setup.pyo
 ${PYSITELIB}/numpy/lib/shape_base.py
 ${PYSITELIB}/numpy/lib/shape_base.pyc
+${PYSITELIB}/numpy/lib/shape_base.pyi
 ${PYSITELIB}/numpy/lib/shape_base.pyo
 ${PYSITELIB}/numpy/lib/stride_tricks.py
 ${PYSITELIB}/numpy/lib/stride_tricks.pyc
+${PYSITELIB}/numpy/lib/stride_tricks.pyi
 ${PYSITELIB}/numpy/lib/stride_tricks.pyo
 ${PYSITELIB}/numpy/lib/tests/__init__.py
 ${PYSITELIB}/numpy/lib/tests/__init__.pyc
@@ -954,18 +985,22 @@ ${PYSITELIB}/numpy/lib/tests/test_utils.pyc
 ${PYSITELIB}/numpy/lib/tests/test_utils.pyo
 ${PYSITELIB}/numpy/lib/twodim_base.py
 ${PYSITELIB}/numpy/lib/twodim_base.pyc
+${PYSITELIB}/numpy/lib/twodim_base.pyi
 ${PYSITELIB}/numpy/lib/twodim_base.pyo
 ${PYSITELIB}/numpy/lib/type_check.py
 ${PYSITELIB}/numpy/lib/type_check.pyc
+${PYSITELIB}/numpy/lib/type_check.pyi
 ${PYSITELIB}/numpy/lib/type_check.pyo
 ${PYSITELIB}/numpy/lib/ufunclike.py
 ${PYSITELIB}/numpy/lib/ufunclike.pyc
+${PYSITELIB}/numpy/lib/ufunclike.pyi
 ${PYSITELIB}/numpy/lib/ufunclike.pyo
 ${PYSITELIB}/numpy/lib/user_array.py
 ${PYSITELIB}/numpy/lib/user_array.pyc
 ${PYSITELIB}/numpy/lib/user_array.pyo
 ${PYSITELIB}/numpy/lib/utils.py
 ${PYSITELIB}/numpy/lib/utils.pyc
+${PYSITELIB}/numpy/lib/utils.pyi
 ${PYSITELIB}/numpy/lib/utils.pyo
 ${PYSITELIB}/numpy/linalg/__init__.py
 ${PYSITELIB}/numpy/linalg/__init__.pyc
@@ -1003,12 +1038,15 @@ ${PYSITELIB}/numpy/ma/bench.pyc
 ${PYSITELIB}/numpy/ma/bench.pyo
 ${PYSITELIB}/numpy/ma/core.py
 ${PYSITELIB}/numpy/ma/core.pyc
+${PYSITELIB}/numpy/ma/core.pyi
 ${PYSITELIB}/numpy/ma/core.pyo
 ${PYSITELIB}/numpy/ma/extras.py
 ${PYSITELIB}/numpy/ma/extras.pyc
+${PYSITELIB}/numpy/ma/extras.pyi
 ${PYSITELIB}/numpy/ma/extras.pyo
 ${PYSITELIB}/numpy/ma/mrecords.py
 ${PYSITELIB}/numpy/ma/mrecords.pyc
+${PYSITELIB}/numpy/ma/mrecords.pyi
 ${PYSITELIB}/numpy/ma/mrecords.pyo
 ${PYSITELIB}/numpy/ma/setup.py
 ${PYSITELIB}/numpy/ma/setup.pyc
@@ -1086,27 +1124,35 @@ ${PYSITELIB}/numpy/polynomial/__init__.pyi
 ${PYSITELIB}/numpy/polynomial/__init__.pyo
 ${PYSITELIB}/numpy/polynomial/_polybase.py
 ${PYSITELIB}/numpy/polynomial/_polybase.pyc
+${PYSITELIB}/numpy/polynomial/_polybase.pyi
 ${PYSITELIB}/numpy/polynomial/_polybase.pyo
 ${PYSITELIB}/numpy/polynomial/chebyshev.py
 ${PYSITELIB}/numpy/polynomial/chebyshev.pyc
+${PYSITELIB}/numpy/polynomial/chebyshev.pyi
 ${PYSITELIB}/numpy/polynomial/chebyshev.pyo
 ${PYSITELIB}/numpy/polynomial/hermite.py
 ${PYSITELIB}/numpy/polynomial/hermite.pyc
+${PYSITELIB}/numpy/polynomial/hermite.pyi
 ${PYSITELIB}/numpy/polynomial/hermite.pyo
 ${PYSITELIB}/numpy/polynomial/hermite_e.py
 ${PYSITELIB}/numpy/polynomial/hermite_e.pyc
+${PYSITELIB}/numpy/polynomial/hermite_e.pyi
 ${PYSITELIB}/numpy/polynomial/hermite_e.pyo
 ${PYSITELIB}/numpy/polynomial/laguerre.py
 ${PYSITELIB}/numpy/polynomial/laguerre.pyc
+${PYSITELIB}/numpy/polynomial/laguerre.pyi
 ${PYSITELIB}/numpy/polynomial/laguerre.pyo
 ${PYSITELIB}/numpy/polynomial/legendre.py
 ${PYSITELIB}/numpy/polynomial/legendre.pyc
+${PYSITELIB}/numpy/polynomial/legendre.pyi
 ${PYSITELIB}/numpy/polynomial/legendre.pyo
 ${PYSITELIB}/numpy/polynomial/polynomial.py
 ${PYSITELIB}/numpy/polynomial/polynomial.pyc
+${PYSITELIB}/numpy/polynomial/polynomial.pyi
 ${PYSITELIB}/numpy/polynomial/polynomial.pyo
 ${PYSITELIB}/numpy/polynomial/polyutils.py
 ${PYSITELIB}/numpy/polynomial/polyutils.pyc
+${PYSITELIB}/numpy/polynomial/polyutils.pyi
 ${PYSITELIB}/numpy/polynomial/polyutils.pyo
 ${PYSITELIB}/numpy/polynomial/setup.py
 ${PYSITELIB}/numpy/polynomial/setup.pyc
@@ -1158,18 +1204,25 @@ ${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.pyi
 ${PYSITELIB}/numpy/random/_generator.so
+${PYSITELIB}/numpy/random/_mt19937.pyi
 ${PYSITELIB}/numpy/random/_mt19937.so
+${PYSITELIB}/numpy/random/_pcg64.pyi
 ${PYSITELIB}/numpy/random/_pcg64.so
+${PYSITELIB}/numpy/random/_philox.pyi
 ${PYSITELIB}/numpy/random/_philox.so
 ${PYSITELIB}/numpy/random/_pickle.py
 ${PYSITELIB}/numpy/random/_pickle.pyc
 ${PYSITELIB}/numpy/random/_pickle.pyo
+${PYSITELIB}/numpy/random/_sfc64.pyi
 ${PYSITELIB}/numpy/random/_sfc64.so
 ${PYSITELIB}/numpy/random/bit_generator.pxd
+${PYSITELIB}/numpy/random/bit_generator.pyi
 ${PYSITELIB}/numpy/random/bit_generator.so
 ${PYSITELIB}/numpy/random/c_distributions.pxd
 ${PYSITELIB}/numpy/random/lib/libnpyrandom.a
+${PYSITELIB}/numpy/random/mtrand.pyi
 ${PYSITELIB}/numpy/random/mtrand.so
 ${PYSITELIB}/numpy/random/setup.py
 ${PYSITELIB}/numpy/random/setup.pyc
@@ -1182,6 +1235,8 @@ ${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/pcg64dxsm-testset-1.csv
+${PYSITELIB}/numpy/random/tests/data/pcg64dxsm-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
@@ -1251,9 +1306,6 @@ ${PYSITELIB}/numpy/testing/setup.pyo
 ${PYSITELIB}/numpy/testing/tests/__init__.py
 ${PYSITELIB}/numpy/testing/tests/__init__.pyc
 ${PYSITELIB}/numpy/testing/tests/__init__.pyo
-${PYSITELIB}/numpy/testing/tests/test_decorators.py
-${PYSITELIB}/numpy/testing/tests/test_decorators.pyc
-${PYSITELIB}/numpy/testing/tests/test_decorators.pyo
 ${PYSITELIB}/numpy/testing/tests/test_doctesting.py
 ${PYSITELIB}/numpy/testing/tests/test_doctesting.pyc
 ${PYSITELIB}/numpy/testing/tests/test_doctesting.pyo
@@ -1299,15 +1351,31 @@ ${PYSITELIB}/numpy/typing/_array_like.pyo
 ${PYSITELIB}/numpy/typing/_callable.py
 ${PYSITELIB}/numpy/typing/_callable.pyc
 ${PYSITELIB}/numpy/typing/_callable.pyo
+${PYSITELIB}/numpy/typing/_char_codes.py
+${PYSITELIB}/numpy/typing/_char_codes.pyc
+${PYSITELIB}/numpy/typing/_char_codes.pyo
 ${PYSITELIB}/numpy/typing/_dtype_like.py
 ${PYSITELIB}/numpy/typing/_dtype_like.pyc
 ${PYSITELIB}/numpy/typing/_dtype_like.pyo
+${PYSITELIB}/numpy/typing/_extended_precision.py
+${PYSITELIB}/numpy/typing/_extended_precision.pyc
+${PYSITELIB}/numpy/typing/_extended_precision.pyo
+${PYSITELIB}/numpy/typing/_generic_alias.py
+${PYSITELIB}/numpy/typing/_generic_alias.pyc
+${PYSITELIB}/numpy/typing/_generic_alias.pyo
+${PYSITELIB}/numpy/typing/_nbit.py
+${PYSITELIB}/numpy/typing/_nbit.pyc
+${PYSITELIB}/numpy/typing/_nbit.pyo
 ${PYSITELIB}/numpy/typing/_scalars.py
 ${PYSITELIB}/numpy/typing/_scalars.pyc
 ${PYSITELIB}/numpy/typing/_scalars.pyo
 ${PYSITELIB}/numpy/typing/_shape.py
 ${PYSITELIB}/numpy/typing/_shape.pyc
 ${PYSITELIB}/numpy/typing/_shape.pyo
+${PYSITELIB}/numpy/typing/_ufunc.pyi
+${PYSITELIB}/numpy/typing/mypy_plugin.py
+${PYSITELIB}/numpy/typing/mypy_plugin.pyc
+${PYSITELIB}/numpy/typing/mypy_plugin.pyo
 ${PYSITELIB}/numpy/typing/setup.py
 ${PYSITELIB}/numpy/typing/setup.pyc
 ${PYSITELIB}/numpy/typing/setup.pyo
@@ -1317,65 +1385,108 @@ ${PYSITELIB}/numpy/typing/tests/__init__.pyo
 ${PYSITELIB}/numpy/typing/tests/data/fail/arithmetic.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/array_constructors.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/array_like.py
+${PYSITELIB}/numpy/typing/tests/data/fail/arrayprint.py
+${PYSITELIB}/numpy/typing/tests/data/fail/arrayterator.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/bitwise_ops.py
+${PYSITELIB}/numpy/typing/tests/data/fail/comparisons.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/constants.py
+${PYSITELIB}/numpy/typing/tests/data/fail/datasource.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/dtype.py
+${PYSITELIB}/numpy/typing/tests/data/fail/einsumfunc.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/flatiter.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/fromnumeric.py
+${PYSITELIB}/numpy/typing/tests/data/fail/index_tricks.py
+${PYSITELIB}/numpy/typing/tests/data/fail/lib_utils.py
+${PYSITELIB}/numpy/typing/tests/data/fail/lib_version.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/modules.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/ndarray.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/ndarray_misc.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/numerictypes.py
+${PYSITELIB}/numpy/typing/tests/data/fail/random.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/scalars.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/ufunc_config.py
+${PYSITELIB}/numpy/typing/tests/data/fail/ufunclike.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/ufuncs.py
 ${PYSITELIB}/numpy/typing/tests/data/fail/warnings_and_errors.py
+${PYSITELIB}/numpy/typing/tests/data/misc/extended_precision.py
 ${PYSITELIB}/numpy/typing/tests/data/mypy.ini
 ${PYSITELIB}/numpy/typing/tests/data/pass/arithmetic.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/array_constructors.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/array_like.py
+${PYSITELIB}/numpy/typing/tests/data/pass/arrayprint.py
+${PYSITELIB}/numpy/typing/tests/data/pass/arrayterator.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/bitwise_ops.py
+${PYSITELIB}/numpy/typing/tests/data/pass/comparisons.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/dtype.py
+${PYSITELIB}/numpy/typing/tests/data/pass/einsumfunc.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/flatiter.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/fromnumeric.py
+${PYSITELIB}/numpy/typing/tests/data/pass/index_tricks.py
+${PYSITELIB}/numpy/typing/tests/data/pass/lib_utils.py
+${PYSITELIB}/numpy/typing/tests/data/pass/lib_version.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/literal.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/mod.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/modules.py
+${PYSITELIB}/numpy/typing/tests/data/pass/multiarray.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/ndarray_conversion.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/ndarray_misc.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/ndarray_shape_manipulation.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/numeric.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/numerictypes.py
+${PYSITELIB}/numpy/typing/tests/data/pass/random.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/scalars.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/simple.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/simple_py3.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/ufunc_config.py
+${PYSITELIB}/numpy/typing/tests/data/pass/ufunclike.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/ufuncs.py
 ${PYSITELIB}/numpy/typing/tests/data/pass/warnings_and_errors.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/arithmetic.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/array_constructors.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/arrayprint.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/arrayterator.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/bitwise_ops.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/comparisons.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/constants.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/datasource.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/dtype.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/einsumfunc.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/flatiter.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/fromnumeric.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/index_tricks.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/lib_utils.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/lib_version.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/mod.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/modules.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/multiarray.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/nbit_base_example.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/ndarray_conversion.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/ndarray_misc.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/ndarray_shape_manipulation.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/nditer.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/numeric.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/numerictypes.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/random.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/scalars.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/ufunc_config.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/ufunclike.py
+${PYSITELIB}/numpy/typing/tests/data/reveal/ufuncs.py
 ${PYSITELIB}/numpy/typing/tests/data/reveal/warnings_and_errors.py
+${PYSITELIB}/numpy/typing/tests/test_generic_alias.py
+${PYSITELIB}/numpy/typing/tests/test_generic_alias.pyc
+${PYSITELIB}/numpy/typing/tests/test_generic_alias.pyo
 ${PYSITELIB}/numpy/typing/tests/test_isfile.py
 ${PYSITELIB}/numpy/typing/tests/test_isfile.pyc
 ${PYSITELIB}/numpy/typing/tests/test_isfile.pyo
+${PYSITELIB}/numpy/typing/tests/test_runtime.py
+${PYSITELIB}/numpy/typing/tests/test_runtime.pyc
+${PYSITELIB}/numpy/typing/tests/test_runtime.pyo
 ${PYSITELIB}/numpy/typing/tests/test_typing.py
 ${PYSITELIB}/numpy/typing/tests/test_typing.pyc
 ${PYSITELIB}/numpy/typing/tests/test_typing.pyo
+${PYSITELIB}/numpy/typing/tests/test_typing_extensions.py
+${PYSITELIB}/numpy/typing/tests/test_typing_extensions.pyc
+${PYSITELIB}/numpy/typing/tests/test_typing_extensions.pyo
 ${PYSITELIB}/numpy/version.py
 ${PYSITELIB}/numpy/version.pyc
 ${PYSITELIB}/numpy/version.pyo
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 59421779836..2f905362ec7 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.65 2021/10/26 10:56:03 nia Exp $
+$NetBSD: distinfo,v 1.66 2021/11/02 18:48:28 adam Exp $
 
-BLAKE2s (numpy-1.20.3.zip) = 7ff2bc29c88c03207b817a477f6a28f9ef2abdd8b2715f904038fa12b91f43ce
-SHA512 (numpy-1.20.3.zip) = 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
-Size (numpy-1.20.3.zip) = 7761912 bytes
+BLAKE2s (numpy-1.21.3.zip) = 9c816f9fe7d0bb4c599a17b11064be0a5c74da4ada3c9d972c1f5713dbad1eaf
+SHA512 (numpy-1.21.3.zip) = 8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792
+Size (numpy-1.21.3.zip) = 10269351 bytes
 SHA1 (patch-numpy_core_setup.py) = 70db6193da36d31a085036e2b61b154e990f70de
 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7
-SHA1 (patch-numpy_distutils_system__info.py) = c58aa2b8f4d489376097445803d4bb3d053060d7
 SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8
 SHA1 (patch-numpy_linalg_setup.py) = 867a2aba13ebb60b67ac2824a4cb1aff2e1231ee
diff --git a/math/py-numpy/patches/patch-numpy_distutils_system__info.py b/math/py-numpy/patches/patch-numpy_distutils_system__info.py
deleted file mode 100644
index 203b2185417..00000000000
--- a/math/py-numpy/patches/patch-numpy_distutils_system__info.py
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-numpy_distutils_system__info.py,v 1.9 2021/06/15 01:43:44 thor Exp $
-
-Our BLAS choice in build system (merged upstream for next release).
-
---- numpy/distutils/system_info.py.orig	2021-03-27 09:52:12.000000000 +0000
-+++ numpy/distutils/system_info.py
-@@ -114,6 +114,19 @@ Currently, the following classes are ava
-     x11_info:x11
-     xft_info:xft
- 
-+Note that blas_opt_info and lapack_opt_info honor the NPY_BLAS_ORDER
-+and NPY_LAPACK_ORDER environment variables to determine the order in which
-+specific BLAS and LAPACK libraries are searched for.
-+
-+This search (or autodetection) can be bypassed by defining the environment
-+variables NPY_BLAS_LIBS and NPY_LAPACK_LIBS, which should then contain the
-+exact linker flags to use (language will be set to F77). Building against
-+Netlib BLAS/LAPACK or stub files, in order to be able to switch BLAS and LAPACK
-+implementations at runtime. If using this to build NumPy itself, it is
-+recommended to also define NPY_CBLAS_LIBS (assuming your BLAS library has a
-+CBLAS interface) to enable CBLAS usage for matrix multiplication (unoptimized
-+otherwise).
-+
- Example:
- ----------
- [DEFAULT]
-@@ -1845,6 +1858,16 @@ class lapack_opt_info(system_info):
-             return True
-         return False
- 
-+    def _calc_info_from_envvar(self):
-+        info = {}
-+        info['language'] = 'f77'
-+        info['libraries'] = []
-+        info['include_dirs'] = []
-+        info['define_macros'] = []
-+        info['extra_link_args'] = os.environ['NPY_LAPACK_LIBS'].split()
-+        self.set_info(**info)
-+        return True
-+
-     def _calc_info(self, name):
-         return getattr(self, '_calc_info_{}'.format(name))()
- 
-@@ -1855,6 +1878,12 @@ class lapack_opt_info(system_info):
-                              "LAPACK order has unacceptable "
-                              "values: {}".format(unknown_order))
- 
-+        if 'NPY_LAPACK_LIBS' in os.environ:
-+            # Bypass autodetection, set language to F77 and use env var linker
-+            # flags directly
-+            self._calc_info_from_envvar()
-+            return
-+
-         for lapack in lapack_order:
-             if self._calc_info(lapack):
-                 return
-@@ -1977,6 +2006,20 @@ class blas_opt_info(system_info):
-         self.set_info(**info)
-         return True
- 
-+    def _calc_info_from_envvar(self):
-+        info = {}
-+        info['language'] = 'f77'
-+        info['libraries'] = []
-+        info['include_dirs'] = []
-+        info['define_macros'] = []
-+        info['extra_link_args'] = os.environ['NPY_BLAS_LIBS'].split()
-+        if 'NPY_CBLAS_LIBS' in os.environ:
-+            info['define_macros'].append(('HAVE_CBLAS', None))
-+            info['extra_link_args'].extend(
-+                                        os.environ['NPY_CBLAS_LIBS'].split())
-+        self.set_info(**info)
-+        return True
-+
-     def _calc_info(self, name):
-         return getattr(self, '_calc_info_{}'.format(name))()
- 
-@@ -1985,6 +2028,12 @@ class blas_opt_info(system_info):
-         if len(unknown_order) > 0:
-             raise ValueError("blas_opt_info user defined BLAS order has unacceptable values: {}".format(unknown_order))
- 
-+        if 'NPY_BLAS_LIBS' in os.environ:
-+            # Bypass autodetection, set language to F77 and use env var linker
-+            # flags directly
-+            self._calc_info_from_envvar()
-+            return
-+
-         for blas in blas_order:
-             if self._calc_info(blas):
-                 return