- Update to 1.13.1

PR:		220986
Submitted by:	wen@(myself)
Exp-run by:	antoine@

5 files changed, 218 insertions, 219 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index c518e3e89f1f..48f199704c68 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numpy
-PORTVERSION=	1.11.2
-PORTREVISION=	3
+PORTVERSION=	1.13.1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP:source \
@@ -22,7 +21,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 PYDISTUTILS_BUILDARGS=		--fcompiler=gnu95
 PYDISTUTILS_CONFIGUREARGS=	--fcompiler=gnu95
-USES=		fortran python
+USES=		fortran python zip
 USE_PYTHON=	concurrent distutils py3kplist
 LDFLAGS+=	-shared
 
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 2dcbc5b27663..a470bf84134b 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1475774524
-SHA256 (numpy-1.11.2.tar.gz) = 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69
-SIZE (numpy-1.11.2.tar.gz) = 4178447
+TIMESTAMP = 1500813040
+SHA256 (numpy-1.13.1.zip) = c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb
+SIZE (numpy-1.13.1.zip) = 5012881
 SHA256 (reference.pdf) = 2f6f6eb0423a27a60cc4c5a79154b1d1491704e8d2ad347059bf02ee4f22f8c8
 SIZE (reference.pdf) = 4529593
 SHA256 (userguide.pdf) = e546a80d2e260448015aaa977acc68f4915f8850c3ad6172fd0cfbeb68ab0e4b
diff --git a/math/py-numpy/files/patch-numpy_core_include_numpy_npy__endian.h b/math/py-numpy/files/patch-numpy_core_include_numpy_npy__endian.h
deleted file mode 100644
index 91783ad5441f..000000000000
--- a/math/py-numpy/files/patch-numpy_core_include_numpy_npy__endian.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/core/include/numpy/npy_endian.h.orig	2016-06-18 16:15:37 UTC
-+++ numpy/core/include/numpy/npy_endian.h
-@@ -8,7 +8,7 @@
- 
- #ifdef NPY_HAVE_ENDIAN_H
-     /* Use endian.h if available */
--    #include <endian.h>
-+    #include <sys/endian.h>
- 
-     #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && defined(LITTLE_ENDIAN)
-         #define NPY_BYTE_ORDER    BYTE_ORDER
diff --git a/math/py-numpy/files/patch-numpy_core_setup.py b/math/py-numpy/files/patch-numpy_core_setup.py
deleted file mode 100644
index 5178eaf60163..000000000000
--- a/math/py-numpy/files/patch-numpy_core_setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/core/setup.py.orig	2016-06-25 23:59:40 UTC
-+++ numpy/core/setup.py
-@@ -268,7 +268,7 @@ def check_types(config_cmd, ext, build_d
-         raise SystemError(
-                 "Cannot compile 'Python.h'. Perhaps you need to "
-                 "install python-dev|python-devel.")
--    res = config_cmd.check_header("endian.h")
-+    res = config_cmd.check_header("sys/endian.h")
-     if res:
-         private_defines.append(('HAVE_ENDIAN_H', 1))
-         public_defines.append(('NPY_HAVE_ENDIAN_H', 1))
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index 7ebe4237e14b..a02291e47a53 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -1,62 +1,68 @@
 bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/__config__.py
 %%PYTHON_SITELIBDIR%%/numpy/__config__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/__config__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/__config__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/__init__.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/numpy/_distributor_init.py
+%%PYTHON_SITELIBDIR%%/numpy/_distributor_init.pyc
+%%PYTHON_SITELIBDIR%%/numpy/_distributor_init.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/_globals.py
 %%PYTHON_SITELIBDIR%%/numpy/_globals.pyc
-%%PYTHON_SITELIBDIR%%/numpy/_globals.pyo
+%%PYTHON_SITELIBDIR%%/numpy/_globals.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/_import_tools.py
 %%PYTHON_SITELIBDIR%%/numpy/_import_tools.pyc
-%%PYTHON_SITELIBDIR%%/numpy/_import_tools.pyo
+%%PYTHON_SITELIBDIR%%/numpy/_import_tools.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/add_newdocs.py
 %%PYTHON_SITELIBDIR%%/numpy/add_newdocs.pyc
-%%PYTHON_SITELIBDIR%%/numpy/add_newdocs.pyo
+%%PYTHON_SITELIBDIR%%/numpy/add_newdocs.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/compat/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/compat/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/compat/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/compat/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.py
 %%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.pyc
-%%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.pyo
+%%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/compat/py3k.py
 %%PYTHON_SITELIBDIR%%/numpy/compat/py3k.pyc
-%%PYTHON_SITELIBDIR%%/numpy/compat/py3k.pyo
+%%PYTHON_SITELIBDIR%%/numpy/compat/py3k.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/compat/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/compat/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/compat/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/compat/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/_dummy.so
 %%PYTHON_SITELIBDIR%%/numpy/core/_internal.py
 %%PYTHON_SITELIBDIR%%/numpy/core/_internal.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/_internal.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/_internal.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/_methods.py
 %%PYTHON_SITELIBDIR%%/numpy/core/_methods.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/_methods.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/_methods.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/arrayprint.py
 %%PYTHON_SITELIBDIR%%/numpy/core/arrayprint.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/arrayprint.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/arrayprint.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/cversions.py
 %%PYTHON_SITELIBDIR%%/numpy/core/cversions.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/cversions.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/cversions.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/defchararray.py
 %%PYTHON_SITELIBDIR%%/numpy/core/defchararray.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/defchararray.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/defchararray.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/numpy/core/einsumfunc.py
+%%PYTHON_SITELIBDIR%%/numpy/core/einsumfunc.pyc
+%%PYTHON_SITELIBDIR%%/numpy/core/einsumfunc.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/fromnumeric.py
 %%PYTHON_SITELIBDIR%%/numpy/core/fromnumeric.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/fromnumeric.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/fromnumeric.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/function_base.py
 %%PYTHON_SITELIBDIR%%/numpy/core/function_base.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/function_base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/function_base.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/generate_numpy_api.py
 %%PYTHON_SITELIBDIR%%/numpy/core/generate_numpy_api.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/generate_numpy_api.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/generate_numpy_api.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/getlimits.py
 %%PYTHON_SITELIBDIR%%/numpy/core/getlimits.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/getlimits.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/getlimits.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/__multiarray_api.h
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/__ufunc_api.h
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/_neighborhood_iterator_imp.h
@@ -85,37 +91,37 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/utils.h
 %%PYTHON_SITELIBDIR%%/numpy/core/info.py
 %%PYTHON_SITELIBDIR%%/numpy/core/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/lib/libnpymath.a
 %%PYTHON_SITELIBDIR%%/numpy/core/lib/npy-pkg-config/mlib.ini
 %%PYTHON_SITELIBDIR%%/numpy/core/lib/npy-pkg-config/npymath.ini
 %%PYTHON_SITELIBDIR%%/numpy/core/machar.py
 %%PYTHON_SITELIBDIR%%/numpy/core/machar.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/machar.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/machar.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/memmap.py
 %%PYTHON_SITELIBDIR%%/numpy/core/memmap.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/memmap.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/memmap.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/multiarray.so
 %%PYTHON_SITELIBDIR%%/numpy/core/multiarray_tests.so
 %%PYTHON_SITELIBDIR%%/numpy/core/numeric.py
 %%PYTHON_SITELIBDIR%%/numpy/core/numeric.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/numeric.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/numeric.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/numerictypes.py
 %%PYTHON_SITELIBDIR%%/numpy/core/numerictypes.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/numerictypes.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/numerictypes.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/operand_flag_tests.so
 %%PYTHON_SITELIBDIR%%/numpy/core/records.py
 %%PYTHON_SITELIBDIR%%/numpy/core/records.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/records.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/records.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/setup_common.py
 %%PYTHON_SITELIBDIR%%/numpy/core/setup_common.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/setup_common.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/setup_common.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/shape_base.py
 %%PYTHON_SITELIBDIR%%/numpy/core/shape_base.pyc
-%%PYTHON_SITELIBDIR%%/numpy/core/shape_base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/core/shape_base.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/core/struct_ufunc_test.so
 %%PYTHON_SITELIBDIR%%/numpy/core/test_rational.so
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/data/astype_copy.pkl
@@ -159,189 +165,189 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/umath_tests.so
 %%PYTHON_SITELIBDIR%%/numpy/ctypeslib.py
 %%PYTHON_SITELIBDIR%%/numpy/ctypeslib.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ctypeslib.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ctypeslib.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__config__.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__config__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/__config__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/__config__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__version__.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/__version__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/__version__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/__version__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/ccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/ccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/ccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/ccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/autodist.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/autodist.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/autodist.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/autodist.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/bdist_rpm.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/bdist_rpm.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/bdist_rpm.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/bdist_rpm.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_clib.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_clib.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_clib.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_clib.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_ext.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_ext.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_ext.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_ext.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_py.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_py.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_py.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_py.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_scripts.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_scripts.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_scripts.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_scripts.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_src.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_src.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_src.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/build_src.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/config.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/config.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/config.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/config.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/config_compiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/config_compiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/config_compiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/config_compiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/develop.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/develop.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/develop.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/develop.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/egg_info.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/egg_info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/egg_info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/egg_info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_clib.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_clib.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_clib.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_clib.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_data.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_data.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_data.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_data.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_headers.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_headers.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_headers.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/install_headers.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/compat.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/compat.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/compat.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/compat.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/core.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/core.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/core.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/core.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/environment.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/environment.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/environment.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/environment.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/extension.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/extension.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/extension.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/extension.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/absoft.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/absoft.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/absoft.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/absoft.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/compaq.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/compaq.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/compaq.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/compaq.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/g95.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/g95.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/g95.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/g95.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/hpux.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/hpux.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/hpux.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/hpux.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/ibm.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/ibm.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/ibm.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/ibm.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/intel.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/intel.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/intel.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/intel.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/lahey.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/lahey.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/lahey.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/lahey.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/mips.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/mips.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/mips.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/mips.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/nag.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/nag.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/nag.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/nag.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/none.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pathf95.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/pg.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/sun.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/sun.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/sun.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/sun.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/vast.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/vast.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/vast.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/vast.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/from_template.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/from_template.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/from_template.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/from_template.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/info.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/intelccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/intelccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/intelccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/intelccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/lib2def.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/lib2def.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/lib2def.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/lib2def.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/line_endings.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/line_endings.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/line_endings.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/line_endings.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/log.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/log.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/log.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/log.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/mingw/gfortran_vs2003_hack.c
 %%PYTHON_SITELIBDIR%%/numpy/distutils/mingw32ccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/mingw32ccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/mingw32ccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/mingw32ccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/numpy_distribution.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/site.cfg
 %%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_exec_command.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_fcompiler_gnu.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_fcompiler_intel.py
@@ -350,100 +356,100 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_system_info.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyc
-%%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyo
+%%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/basics.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/basics.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/basics.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/basics.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/broadcasting.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/broadcasting.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/broadcasting.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/broadcasting.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/byteswapping.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/byteswapping.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/byteswapping.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/byteswapping.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/constants.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/constants.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/constants.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/constants.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/creation.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/creation.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/creation.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/creation.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/glossary.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/glossary.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/glossary.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/glossary.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/indexing.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/indexing.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/indexing.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/indexing.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/internals.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/internals.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/internals.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/internals.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/misc.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/misc.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/misc.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/misc.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/structured_arrays.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/structured_arrays.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/structured_arrays.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/structured_arrays.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/subclassing.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/subclassing.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/subclassing.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/subclassing.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.pyc
-%%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.pyo
+%%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/dual.py
 %%PYTHON_SITELIBDIR%%/numpy/dual.pyc
-%%PYTHON_SITELIBDIR%%/numpy/dual.pyo
+%%PYTHON_SITELIBDIR%%/numpy/dual.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/auxfuncs.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/auxfuncs.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/auxfuncs.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/auxfuncs.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/capi_maps.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/capi_maps.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/capi_maps.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/capi_maps.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/cb_rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/cb_rules.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/cb_rules.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/cb_rules.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/cfuncs.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/cfuncs.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/cfuncs.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/cfuncs.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/common_rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/common_rules.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/common_rules.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/common_rules.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/crackfortran.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/crackfortran.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/crackfortran.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/crackfortran.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/diagnose.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/diagnose.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/diagnose.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/diagnose.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py_testing.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py_testing.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py_testing.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py_testing.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f90mod_rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f90mod_rules.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/f90mod_rules.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/f90mod_rules.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/func2subr.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/func2subr.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/func2subr.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/func2subr.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/info.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/rules.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/rules.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/rules.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.c
 %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.h
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
@@ -452,17 +458,26 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/foo_mod.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/foo_use.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/assumed_shape/precision.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/common/block.f
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/kind/foo.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo.f
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_fixed.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_free.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/parameter/constant_both.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/parameter/constant_compound.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/parameter/constant_integer.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/parameter/constant_non_compound.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/parameter/constant_real.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/regression/inout.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/size/foo.f90
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/string/char.f90
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_array_from_pyobj.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_assumed_shape.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_callback.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_common.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_kind.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_mixed.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_parameter.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_regression.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_character.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_complex.py
@@ -470,88 +485,92 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_logical.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_real.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_size.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_string.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/util.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.pyc
-%%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/fft/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/fft/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/fftpack.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/fftpack.pyc
-%%PYTHON_SITELIBDIR%%/numpy/fft/fftpack.pyo
+%%PYTHON_SITELIBDIR%%/numpy/fft/fftpack.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/fftpack_lite.so
 %%PYTHON_SITELIBDIR%%/numpy/fft/helper.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/helper.pyc
-%%PYTHON_SITELIBDIR%%/numpy/fft/helper.pyo
+%%PYTHON_SITELIBDIR%%/numpy/fft/helper.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/info.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/fft/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/fft/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/fft/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/fft/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/fft/tests/test_fftpack.py
 %%PYTHON_SITELIBDIR%%/numpy/fft/tests/test_helper.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/_iotools.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/_iotools.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/_iotools.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/_iotools.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/_version.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/_version.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/_version.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/_version.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/arraypad.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/arraypad.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/arraypad.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/arraypad.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/arraysetops.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/arraysetops.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/arraysetops.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/arraysetops.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/arrayterator.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/financial.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/financial.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/financial.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/financial.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/format.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/format.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/format.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/format.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/function_base.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/function_base.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/function_base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/function_base.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/index_tricks.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/index_tricks.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/index_tricks.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/index_tricks.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/info.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/info.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/numpy/lib/mixins.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/mixins.pyc
+%%PYTHON_SITELIBDIR%%/numpy/lib/mixins.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/nanfunctions.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/nanfunctions.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/nanfunctions.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/nanfunctions.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/npyio.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/npyio.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/npyio.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/npyio.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/recfunctions.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/recfunctions.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/recfunctions.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/recfunctions.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/scimath.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/scimath.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/scimath.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/scimath.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/shape_base.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py2-objarr.npy
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py2-objarr.npz
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py3-objarr.npy
@@ -569,6 +588,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_function_base.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_index_tricks.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_io.py
+%%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_mixins.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_nanfunctions.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_packbits.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_polynomial.py
@@ -582,56 +602,57 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_utils.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/twodim_base.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/twodim_base.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/twodim_base.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/twodim_base.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/type_check.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/type_check.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/type_check.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/type_check.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/ufunclike.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/ufunclike.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/ufunclike.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/ufunclike.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/user_array.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/user_array.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/user_array.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/user_array.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/lib/utils.py
 %%PYTHON_SITELIBDIR%%/numpy/lib/utils.pyc
-%%PYTHON_SITELIBDIR%%/numpy/lib/utils.pyo
+%%PYTHON_SITELIBDIR%%/numpy/lib/utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/linalg/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/linalg/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/linalg/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/linalg/_umath_linalg.so
 %%PYTHON_SITELIBDIR%%/numpy/linalg/info.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/linalg/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/linalg/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/linalg/lapack_lite.so
 %%PYTHON_SITELIBDIR%%/numpy/linalg/linalg.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/linalg.pyc
-%%PYTHON_SITELIBDIR%%/numpy/linalg/linalg.pyo
+%%PYTHON_SITELIBDIR%%/numpy/linalg/linalg.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/linalg/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/linalg/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/linalg/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/linalg/tests/test_build.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/tests/test_deprecations.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/tests/test_linalg.py
 %%PYTHON_SITELIBDIR%%/numpy/linalg/tests/test_regression.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/bench.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/bench.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/bench.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/bench.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/core.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/core.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/core.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/core.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/extras.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/extras.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/extras.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/extras.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/mrecords.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/mrecords.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/mrecords.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/mrecords.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_core.py
+%%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_deprecations.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_extras.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_mrecords.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_old_ma.py
@@ -639,59 +660,59 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/ma/tests/test_subclassing.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/testutils.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/testutils.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/testutils.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/testutils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/timer_comparison.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/timer_comparison.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/timer_comparison.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/timer_comparison.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/ma/version.py
 %%PYTHON_SITELIBDIR%%/numpy/ma/version.pyc
-%%PYTHON_SITELIBDIR%%/numpy/ma/version.pyo
+%%PYTHON_SITELIBDIR%%/numpy/ma/version.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/matlib.py
 %%PYTHON_SITELIBDIR%%/numpy/matlib.pyc
-%%PYTHON_SITELIBDIR%%/numpy/matlib.pyo
+%%PYTHON_SITELIBDIR%%/numpy/matlib.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/matrixlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/matrixlib/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/defmatrix.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/defmatrix.pyc
-%%PYTHON_SITELIBDIR%%/numpy/matrixlib/defmatrix.pyo
+%%PYTHON_SITELIBDIR%%/numpy/matrixlib/defmatrix.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/matrixlib/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/matrixlib/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/tests/test_defmatrix.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/tests/test_multiarray.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/tests/test_numeric.py
 %%PYTHON_SITELIBDIR%%/numpy/matrixlib/tests/test_regression.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/_polybase.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/_polybase.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/_polybase.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/_polybase.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/chebyshev.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/hermite_e.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/laguerre.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/legendre.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/polynomial/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_chebyshev.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_classes.py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_hermite.py
@@ -703,50 +724,51 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/polynomial/tests/test_printing.py
 %%PYTHON_SITELIBDIR%%/numpy/random/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/random/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/random/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/random/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/random/info.py
 %%PYTHON_SITELIBDIR%%/numpy/random/info.pyc
-%%PYTHON_SITELIBDIR%%/numpy/random/info.pyo
+%%PYTHON_SITELIBDIR%%/numpy/random/info.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/random/mtrand.so
 %%PYTHON_SITELIBDIR%%/numpy/random/randomkit.h
 %%PYTHON_SITELIBDIR%%/numpy/random/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/random/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/random/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/random/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/random/tests/test_random.py
 %%PYTHON_SITELIBDIR%%/numpy/random/tests/test_regression.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/decorators.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/decorators.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/decorators.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/decorators.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/noseclasses.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/noseclasses.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/noseclasses.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/noseclasses.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/nosetester.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/nosetester.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/nosetester.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/nosetester.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/print_coercion_tables.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/setup.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/testing/tests/test_decorators.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/tests/test_doctesting.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/tests/test_utils.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/utils.py
 %%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyc
-%%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyo
+%%PYTHON_SITELIBDIR%%/numpy/testing/utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_ctypeslib.py
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_matlib.py
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_numpy_version.py
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_reloading.py
 %%PYTHON_SITELIBDIR%%/numpy/tests/test_scripts.py
+%%PYTHON_SITELIBDIR%%/numpy/tests/test_warnings.py
 %%PYTHON_SITELIBDIR%%/numpy/version.py
 %%PYTHON_SITELIBDIR%%/numpy/version.pyc
-%%PYTHON_SITELIBDIR%%/numpy/version.pyo
+%%PYTHON_SITELIBDIR%%/numpy/version.%%PYTHON_PYOEXTENSION%%
 man/man1/f2py-%%PYTHON_VER%%.1.gz