Re: WIP: Update of math/py-numpy to 1.16.5

> On Nov 2, 2019, at 2:56 AM, Kurt Mosiejczuk <kurt@cranky.work> wrote:
>
> So the existing py-numpy is unhappy with the 2.7 update and it seems to
> be clashes between clang and gcc.

Should the 2.7 python update be backed out? Or is there some smaller fix for the existing numpy version?

Anyway can you share more details of the problem? I am traveling and probably can't get to a box for at least another week.

>
> This is the last version of py-numpy to work with Python 2.7. 1.17.x will
> be Python 3.5+ only.

Even if 1.17 supported python2, it can't go in right now due to avx issues that I thought I'd solved but apparently haven't and am I'm still trying to debug.

>
> I got this as far as compiling with flang, running its tests mostly
> sucessfully, and packaging. I'm about to start traveling tomorrow

I am also traveling at the moment and not back for a week which is why I think we should back out the python update.


> so I won't get to testing all the consumers right away. I figured I'd
> send this out in case someone wants to throw it through a bulk or pick
> up where I left off.

The challenge with numpy is we really need to test that the direct consumers package *and* we want to do runtime tests as well (ie test the consumers of those consumers). That's a lot of stuff to build which is why I don't update numpy very often and try to do it carefully.

Going to 1.16.5 as a fix for python, without testing numpy in a bulk, preferably on multiple archs is asking for trouble.... it may just work but it also might cause more problems.

I wouldn't go that route in a rush.


>
> (cc maintainer)
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile 7 Jul 2019 14:58:04 -0000 1.55
> +++ Makefile 2 Nov 2019 06:50:17 -0000
> @@ -2,11 +2,10 @@
>
> COMMENT= fast array and numeric programming library for Python
>
> -MODPY_EGG_VERSION= 1.14.6
> +MODPY_EGG_VERSION= 1.16.5
> DISTNAME= numpy-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> EXTRACT_SUFX= .zip
> -REVISION= 1
>
> CATEGORIES= math devel
>
> @@ -17,7 +16,10 @@ MAINTAINER= Daniel Dickman <daniel@open
> # BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
> +COMPILER= base-clang ports-gcc base-gcc
> +
> +WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB} \
> + ${MODPY_WANTLIB}
>
> MODULES= lang/python \
> fortran
> @@ -27,12 +29,12 @@ FLAVOR?=
>
> MODPY_PI = Yes
> MODPY_SETUPTOOLS= Yes
> -MODPY_DISTUTILS_BUILDARGS = --fcompiler=gnu95
>
> -TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} \
> - devel/py-tz${MODPY_FLAVOR}
> +TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH} \
> + devel/py-test${MODPY_FLAVOR} \
> + devel/py-tz${MODPY_FLAVOR}
>
> -MODFORTRAN_COMPILER = gfortran
> +MODFORTRAN_COMPILER = flang
>
> BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
> LIB_DEPENDS= math/lapack \
> @@ -55,8 +57,8 @@ CFLAGS += -D CYTHON_SMALL_CODE=
> pre-build:
> cp -f ${WRKSRC}/numpy/distutils/site.cfg ${WRKSRC}/site.cfg
>
> -do-test: fake
> - cd ${WRKDIR} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -c \
> +do-test:
> + cd ${WRKDIR} && ${MAKE_ENV} ${MODPY_BIN} -c \
> 'import numpy ; numpy.test()'
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 26 Oct 2018 21:09:31 -0000 1.13
> +++ distinfo 2 Nov 2019 06:50:17 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (numpy-1.14.6.zip) = ElDt9vbEPh14I/CWdBa8GCWLsnHcU2KY6w6gCp5FuAo=
> -SIZE (numpy-1.14.6.zip) = 4906096
> +SHA256 (numpy-1.16.5.zip) = i7RS2U6WSzEiBbDeEjjdcgnaRSNDZTqyFLXWgXgOegw=
> +SIZE (numpy-1.16.5.zip) = 5138208
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/py-numpy/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 30 Jun 2018 21:49:33 -0000 1.12
> +++ pkg/PLIST 2 Nov 2019 06:50:17 -0000
> @@ -5,6 +5,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> lib/python${MODPY_VERSION}/site-packages/numpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/LICENSE.txt
> lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
> @@ -14,8 +16,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_distributor_init.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_globals.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_import_tools.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -24,8 +25,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/_distributor_init.py
> lib/python${MODPY_VERSION}/site-packages/numpy/_globals.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/_pytesttester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
> @@ -36,13 +36,22 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
> lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/compat/tests/test_compat.py
> lib/python${MODPY_VERSION}/site-packages/numpy/conftest.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_add_newdocs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_aliased_types.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_dtype_ctypes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_string_helpers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}_type_aliases.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}cversions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -54,15 +63,31 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}machar.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}memmap.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}multiarray.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numeric.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}overrides.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}records.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}setup_common.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}umath_tests.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_add_newdocs.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_aliased_types.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_dtype_ctypes.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_dummy.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_multiarray_umath.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_operand_flag_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_rational_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_string_helpers.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_struct_ufunc_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_type_aliases.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/_umath_tests.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/cversions.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
> @@ -107,19 +132,17 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
> lib/python${MODPY_VERSION}/site-packages/numpy/core/machar.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/struct_ufunc_test.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/test_rational.so
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/_locales.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/recarray_from_file.fits
> @@ -147,10 +170,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_nditer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_numerictypes.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_overrides.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_print.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_records.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalar_ctors.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarbuffer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarinherit.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarmath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
> @@ -159,8 +184,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_unicode.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.so
> -lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.so
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/core/umath_tests.py
> lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
> @@ -169,12 +194,12 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}_shell_utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}conv_template.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}cpuinfo.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}exec_command.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}from_template.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -194,6 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}system_info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}unixccompiler.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__version__.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
> @@ -237,7 +263,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
> @@ -246,6 +271,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}absoft.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}compaq.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}g95.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}hpux.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -261,6 +287,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}vast.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/absoft.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/environment.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
> @@ -295,11 +322,14 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_exec_command.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_gnu.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_intel.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_fcompiler_nagfor.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_from_template.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_misc_util.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_npy_pkg_config.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_shell_utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/test_system_info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/
> @@ -311,6 +341,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}byteswapping.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}creation.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}glossary.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}indexing.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}internals.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -323,6 +354,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/doc/dispatch.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
> lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
> @@ -407,15 +439,18 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_block_docstring.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_callback.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_common.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_compile_function.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_kind.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_mixed.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_parameter.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_quoted_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_regression.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_character.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_complex.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_integer.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_logical.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_return_real.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_semicolon_split.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_string.py
> lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
> @@ -450,6 +485,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}financial.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}format.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}histograms.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}index_tricks.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -475,6 +511,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/mixins.py
> @@ -491,8 +528,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py2-objarr.npz
> -lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npy
> -lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/py3-objarr.npz
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/python3.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/data/win64python2.npy
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test__datasource.py
> @@ -504,6 +539,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_format.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_histograms.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_index_tricks.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_io.py
> lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_mixins.py
> @@ -582,6 +618,9 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/__init__.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_interaction.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_masked_matrix.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_matrix_linalg.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_numeric.py
> lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
> @@ -643,21 +682,21 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}print_coercion_tables.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/decorators.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/noseclasses.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/nosetester.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/parameterized.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/testing/_private/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}parameterized.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/decorators.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/noseclasses.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/nosetester.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/parameterized.py
> -lib/python${MODPY_VERSION}/site-packages/numpy/testing/nose_tools/utils.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
> lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
> @@ -673,6 +712,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_ctypeslib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_matlib.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_numpy_version.py
> +lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_public_api.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_reloading.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_scripts.py
> lib/python${MODPY_VERSION}/site-packages/numpy/tests/test_warnings.py