1.8.2

Daniel Dickman Sun, 14 Sep 2014 20:52:52 -0700

Here's an updated diff for numpy. Since the last version, the update has 
been through a bulk with no direct fallout.


The diff now includes a python3 flavor thanks to work from Dawe and Remi.

bcallah@ thinks this update is needed for an update of math/veusz.

All regress tests pass on i386 under both python2 and python3.

Previous update attempt:
http://marc.info/?l=openbsd-ports&m=140966362809710&w=2

ok to commit?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.39
diff -u -p -u -r1.39 Makefile
--- Makefile    9 Feb 2014 13:32:40 -0000       1.39
+++ Makefile    15 Sep 2014 03:21:22 -0000
@@ -1,16 +1,17 @@
 # $OpenBSD: Makefile,v 1.39 2014/02/09 13:32:40 jasper Exp $
 
 COMMENT=               fast array and numeric programming library for Python
-BROKEN-m88k=           lacks cpu information
 
-MODPY_EGG_VERSION=     1.6.0
+MODPY_EGG_VERSION=     1.8.2
 DISTNAME=              numpy-${MODPY_EGG_VERSION}
 PKGNAME=               py-${DISTNAME}
-REVISION =             4
+
 CATEGORIES=            math devel
 
 HOMEPAGE=              http://numpy.scipy.org/
 
+MAINTAINER=            Daniel Dickman <[email protected]>
+
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
@@ -21,10 +22,13 @@ MASTER_SITES=               ${MASTER_SITE_SOURCEFORGE
 MODULES=               lang/python \
                        fortran
 
+FLAVORS=               python3
+FLAVOR?=
+
 MODPY_SETUPTOOLS=      Yes
 MODPY_SETUP=           setupegg.py
 
-TEST_DEPENDS=  devel/py-nose
+TEST_DEPENDS=  devel/py-nose${MODPY_FLAVOR}
 
 MODFORTRAN_COMPILER =  g77
 
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/math/py-numpy/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo    27 May 2011 10:06:12 -0000      1.8
+++ distinfo    15 Sep 2014 01:26:24 -0000
@@ -1,5 +1,2 @@
-MD5 (numpy-1.6.0.tar.gz) = 4Jk8dMuOgykuVg6sGpvo6Q==
-RMD160 (numpy-1.6.0.tar.gz) = Kb7oVOFDbguq1GFQYG16DS2ArGE=
-SHA1 (numpy-1.6.0.tar.gz) = BpKs+1zcVcolGqK5UOMhpmKBDDY=
-SHA256 (numpy-1.6.0.tar.gz) = aH3PtfalHyEHuh3IuzJP0aAUbOiw4r0Bo+57zEU+49g=
-SIZE (numpy-1.6.0.tar.gz) = 2633698
+SHA256 (numpy-1.8.2.tar.gz) = zldDo6JL8T4Dc/rrJAsI5I0TnmMT8bX7/XcQV8eknb0=
+SIZE (numpy-1.8.2.tar.gz) = 3796725
Index: patches/patch-numpy_core_include_numpy_npy_common_h
===================================================================
RCS file: 
/home/cvs/ports/math/py-numpy/patches/patch-numpy_core_include_numpy_npy_common_h,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-numpy_core_include_numpy_npy_common_h
--- patches/patch-numpy_core_include_numpy_npy_common_h 27 May 2011 10:06:12 
-0000      1.2
+++ patches/patch-numpy_core_include_numpy_npy_common_h 15 Sep 2014 01:26:24 
-0000
@@ -5,9 +5,9 @@ support is present.  since we don't have
 it's own.  however, on alpha, powerpc, it declared functions with
 types that conflict with C99 (double for *l), therefore failed.
 
---- numpy/core/include/numpy/npy_common.h.orig Mon Apr  4 18:33:33 2011
-+++ numpy/core/include/numpy/npy_common.h      Wed May 18 10:57:17 2011
-@@ -72,14 +72,8 @@ typedef unsigned char npy_bool;
+--- numpy/core/include/numpy/npy_common.h.orig Sun Mar  2 09:04:27 2014
++++ numpy/core/include/numpy/npy_common.h      Wed Mar 12 06:00:39 2014
+@@ -255,14 +255,8 @@ typedef unsigned char npy_bool;
  #define NPY_FALSE 0
  #define NPY_TRUE 1
  
Index: patches/patch-numpy_core_tests_test_umath_py
===================================================================
RCS file: patches/patch-numpy_core_tests_test_umath_py
diff -N patches/patch-numpy_core_tests_test_umath_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-numpy_core_tests_test_umath_py        15 Sep 2014 02:08:25 
-0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Silence a RuntimeWarning on np.log1p(np.nan)
+
+See:
+https://github.com/numpy/numpy/issues/5017
+
+--- numpy/core/tests/test_umath.py.orig        Sun Sep 14 21:45:56 2014
++++ numpy/core/tests/test_umath.py     Sun Sep 14 21:47:56 2014
+@@ -309,11 +309,10 @@ class TestLog1p(TestCase):
+         assert_almost_equal(ncu.log1p(1e-6), ncu.log(1+1e-6))
+ 
+     def test_special(self):
+-        assert_equal(ncu.log1p(np.nan), np.nan)
+-        assert_equal(ncu.log1p(np.inf), np.inf)
+-        with np.errstate(divide="ignore"):
++        with np.errstate(invalid="ignore", divide="ignore"):
++            assert_equal(ncu.log1p(np.nan), np.nan)
++            assert_equal(ncu.log1p(np.inf), np.inf)
+             assert_equal(ncu.log1p(-1.), -np.inf)
+-        with np.errstate(invalid="ignore"):
+             assert_equal(ncu.log1p(-2.), np.nan)
+             assert_equal(ncu.log1p(-np.inf), np.nan)
+ 
Index: patches/patch-numpy_distutils_command_build_src_py
===================================================================
RCS file: 
/home/cvs/ports/math/py-numpy/patches/patch-numpy_distutils_command_build_src_py,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-numpy_distutils_command_build_src_py
--- patches/patch-numpy_distutils_command_build_src_py  27 May 2011 10:06:12 
-0000      1.1
+++ patches/patch-numpy_distutils_command_build_src_py  15 Sep 2014 01:26:24 
-0000
@@ -1,10 +1,11 @@
+$OpenBSD: patch-numpy_distutils_command_build_src_py,v 1.1 2011/05/27 10:06:12 
eric Exp $
+
 fix build of other packages (e.g. py-scipy) in some cases (e.g. when
 WRKOBJDIR has a trailing slash)
 
-$OpenBSD: patch-numpy_distutils_command_build_src_py,v 1.1 2011/05/27 10:06:12 
eric Exp $
---- numpy/distutils/command/build_src.py.orig  Thu May 12 17:32:52 2011
-+++ numpy/distutils/command/build_src.py       Thu May 12 17:33:50 2011
-@@ -380,6 +380,7 @@ class build_src(build_ext.build_ext):
+--- numpy/distutils/command/build_src.py.orig  Wed Oct 30 14:31:40 2013
++++ numpy/distutils/command/build_src.py       Tue Nov  5 21:28:46 2013
+@@ -381,6 +381,7 @@ class build_src(build_ext.build_ext):
              #    incl_dirs.append(self.build_src)
              build_dir = os.path.join(*([self.build_src]\
                                         +name.split('.')[:-1]))
Index: patches/patch-numpy_f2py___init___py
===================================================================
RCS file: patches/patch-numpy_f2py___init___py
diff -N patches/patch-numpy_f2py___init___py
--- patches/patch-numpy_f2py___init___py        9 Feb 2014 13:32:40 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-numpy_f2py___init___py,v 1.1 2014/02/09 13:32:40 jasper Exp $
-
-Security fix for CVE-2014-1858, insecure temporary file use
-https://github.com/numpy/numpy/commit/0bb46c1448b0d3f5453d5182a17ea7ac5854ee15
-
---- numpy/f2py/__init__.py.orig        Mon Feb 28 06:40:29 2011
-+++ numpy/f2py/__init__.py     Sun Feb  9 14:18:20 2014
-@@ -27,20 +27,20 @@ def compile(source,
-     from numpy.distutils.exec_command import exec_command
-     import tempfile
-     if source_fn is None:
--        fname = os.path.join(tempfile.mktemp()+'.f')
-+        f = tempfile.NamedTemporaryFile(suffix='.f')
-     else:
--        fname = source_fn
-+        f = open(source_fn, 'w')
- 
--    f = open(fname,'w')
--    f.write(source)
--    f.close()
-+    try:
-+        f.write(source)
-+        f.flush()
- 
--    args = ' -c -m %s %s %s'%(modulename,fname,extra_args)
--    c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' 
%(sys.executable,args)
--    s,o = exec_command(c)
--    if source_fn is None:
--        try: os.remove(fname)
--        except OSError: pass
-+        args = ' -c -m %s %s %s'%(modulename, f.name, extra_args)
-+        c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \
-+                (sys.executable, args)
-+        s, o = exec_command(c)
-+    finally:
-+      f.close()      
-     return s
- 
- from numpy.testing import Tester
Index: patches/patch-numpy_f2py_f2py2e_py
===================================================================
RCS file: patches/patch-numpy_f2py_f2py2e_py
diff -N patches/patch-numpy_f2py_f2py2e_py
--- patches/patch-numpy_f2py_f2py2e_py  9 Feb 2014 13:32:40 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-numpy_f2py_f2py2e_py,v 1.1 2014/02/09 13:32:40 jasper Exp $
-
-Security fix for CVE-2014-1859, insecure temporary file use
-https://github.com/numpy/numpy/commit/0bb46c1448b0d3f5453d5182a17ea7ac5854ee15
-
---- numpy/f2py/f2py2e.py.orig  Sat May  7 22:13:13 2011
-+++ numpy/f2py/f2py2e.py       Sun Feb  9 14:14:01 2014
-@@ -92,7 +92,7 @@ Options:
-                    --lower is assumed with -h key, and --no-lower without -h 
key.
- 
-   --build-dir <dirname>  All f2py generated files are created in <dirname>.
--                   Default is tempfile.mktemp().
-+                   Default is tempfile.mkdtemp().
- 
-   --overwrite-signature  Overwrite existing signature file.
- 
-@@ -426,7 +426,7 @@ def run_compile():
-         del sys.argv[i]
-     else:
-         remove_build_dir = 1
--        build_dir = os.path.join(tempfile.mktemp())
-+        build_dir = tempfile.mkdtemp()
- 
-     sysinfo_flags = filter(re.compile(r'[-][-]link[-]').match,sys.argv[1:])
-     sys.argv = filter(lambda a,flags=sysinfo_flags:a not in flags,sys.argv)
Index: patches/powerpc-patch-numpy_distutils_fcompiler_gnu_py
===================================================================
RCS file: 
/home/cvs/ports/math/py-numpy/patches/powerpc-patch-numpy_distutils_fcompiler_gnu_py,v
retrieving revision 1.2
diff -u -p -u -r1.2 powerpc-patch-numpy_distutils_fcompiler_gnu_py
--- patches/powerpc-patch-numpy_distutils_fcompiler_gnu_py      27 May 2011 
10:06:12 -0000      1.2
+++ patches/powerpc-patch-numpy_distutils_fcompiler_gnu_py      15 Sep 2014 
01:26:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: powerpc-patch-numpy_distutils_fcompiler_gnu_py,v 1.2 2011/05/27 
10:06:12 eric Exp $
---- numpy/distutils/fcompiler/gnu.py.orig      Thu May  5 22:41:53 2011
-+++ numpy/distutils/fcompiler/gnu.py   Wed May 18 12:22:16 2011
-@@ -199,7 +199,8 @@ class GnuFCompiler(FCompiler):
+--- numpy/distutils/fcompiler/gnu.py.orig      Tue Aug  5 14:04:18 2014
++++ numpy/distutils/fcompiler/gnu.py   Tue Sep  2 01:49:40 2014
+@@ -201,7 +201,8 @@ class GnuFCompiler(FCompiler):
              opt = ['-O2']
          else:
              opt = ['-O3']
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/math/py-numpy/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -r1.9 PLIST
--- pkg/PLIST   27 May 2011 10:06:12 -0000      1.9
+++ pkg/PLIST   15 Sep 2014 01:26:24 -0000
@@ -7,44 +7,59 @@ lib/python${MODPY_VERSION}/site-packages
 
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/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/__config__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/__config__.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__config__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}__init__.${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}ctypeslib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}matlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.py
-lib/python${MODPY_VERSION}/site-packages/numpy/_import_tools.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/add_newdocs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}_inspect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}py3k.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/compat/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.py
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/_inspect.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.py
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/py3k.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/compat/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/__init__.pyc
+${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}_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}arrayprint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}defchararray.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}fromnumeric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}function_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}generate_numpy_api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/${MODPY_PYCACHE}getlimits.${MODPY_PYC_MAGIC_TAG}pyc
+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}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}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/_dummy.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/_internal.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/core/_mx_datetime_parser.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/_mx_datetime_parser.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/core/_sort.so
+lib/python${MODPY_VERSION}/site-packages/numpy/core/_methods.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/arrayprint.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/defchararray.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/fromnumeric.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/fromnumeric.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/function_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/function_base.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/generate_numpy_api.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/generate_numpy_api.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/getlimits.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/getlimits.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/
 
lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/__multiarray_api.h
@@ -58,12 +73,14 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/ndarrayobject.h
 
lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/ndarraytypes.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/noprefix.h
+lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_1_7_deprecated_api.h
 
lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_3kcompat.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_common.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_cpu.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_endian.h
 
lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_interrupt.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_math.h
+lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_no_deprecated_api.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/npy_os.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/numpyconfig.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/old_defines.h
@@ -72,35 +89,25 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/ufuncobject.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/include/numpy/utils.h
 lib/python${MODPY_VERSION}/site-packages/numpy/core/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/libnpymath.a
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/lib/npy-pkg-config/mlib.ini
 
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/machar.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/memmap.pyc
 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/numeric.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/numeric.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/numerictypes.pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/core/operand_flag_tests.so
 lib/python${MODPY_VERSION}/site-packages/numpy/core/records.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/records.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/scalarmath.so
-lib/python${MODPY_VERSION}/site-packages/numpy/core/scons_support.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/scons_support.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/setup.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/setup_common.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/core/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/shape_base.pyc
+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/data/
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/data/astype_copy.pkl
@@ -110,159 +117,163 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_blasdot.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_datetime.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_defchararray.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_deprecations.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_dtype.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_einsum.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_errstate.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_function_base.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_getlimits.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_half.py
-lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_iterator.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_indexerrors.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_indexing.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_item_selection.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_machar.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_memmap.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_multiarray.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_multiarray_assignment.py
+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_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_scalarmath.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_scalarprint.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_shape_base.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_ufunc.py
 lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py
+lib/python${MODPY_VERSION}/site-packages/numpy/core/tests/test_umath.py.orig
 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/ctypeslib.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ctypeslib.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__config__.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}/
+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}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
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}intelccompiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}lib2def.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}line_endings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}mingw32ccompiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}misc_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}npy_pkg_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}numpy_distribution.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}pathccompiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+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/__version__.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/ccompiler.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}autodist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}bdist_rpm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build_clib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build_py.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build_scripts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}build_src.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}config_compiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}develop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}egg_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}install_clib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}install_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}install_headers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/${MODPY_PYCACHE}sdist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/autodist.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/autodist.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/bdist_rpm.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/bdist_rpm.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_clib.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_clib.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_ext.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_ext.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_py.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_py.pyc
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_scripts.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_scripts.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_src.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/build_src.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/config.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/config.pyc
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/config_compiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/config_compiler.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/develop.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/develop.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/egg_info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/egg_info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install.pyc
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_clib.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_clib.pyc
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_data.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_data.pyc
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_headers.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/install_headers.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/scons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/scons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/sdist.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/command/sdist.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/compat.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/conv_template.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/core.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/cpuinfo.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/environment.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/exec_command.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/extension.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}/
+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}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
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}ibm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}intel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}lahey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}nag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}none.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}pathf95.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}pg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/${MODPY_PYCACHE}sun.${MODPY_PYC_MAGIC_TAG}pyc
+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/absoft.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/compaq.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/g95.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/gnu.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/hpux.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/ibm.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/ibm.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/intel.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/intel.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/lahey.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/lahey.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/mips.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/mips.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/nag.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/nag.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/none.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/none.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/pathf95.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/pathf95.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/pg.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/pg.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/sun.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/sun.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/vast.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/fcompiler/vast.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/from_template.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/from_template.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/intelccompiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/intelccompiler.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/interactive.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/interactive.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/lib2def.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/lib2def.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/line_endings.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/line_endings.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/log.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/log.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/mingw/
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/mingw/gfortran_vs2003_hack.c
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/mingw32ccompiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/mingw32ccompiler.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/misc_util.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/misc_util.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/npy_pkg_config.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/npy_pkg_config.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/numpy_distribution.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/numpy_distribution.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/pathccompiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/pathccompiler.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/site.cfg
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/system_info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/system_info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/f2py_ext/
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/f2py_ext/__init__.py
@@ -305,70 +316,79 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/swig_ext/tests/
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/swig_ext/tests/test_example.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/distutils/tests/swig_ext/tests/test_example2.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_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_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/unixccompiler.py
-lib/python${MODPY_VERSION}/site-packages/numpy/distutils/unixccompiler.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}basics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}broadcasting.${MODPY_PYC_MAGIC_TAG}pyc
+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}glossary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}howtofind.${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
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}jargon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}methods_vs_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}performance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}structured_arrays.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}subclassing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/doc/${MODPY_PYCACHE}ufuncs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/basics.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/basics.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/broadcasting.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/broadcasting.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/byteswapping.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/constants.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/creation.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/glossary.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/howtofind.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/howtofind.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/indexing.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/internals.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/io.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/io.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/jargon.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/jargon.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/methods_vs_functions.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/methods_vs_functions.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/misc.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/misc.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/performance.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/performance.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/structured_arrays.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/structured_arrays.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/subclassing.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/subclassing.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/doc/ufuncs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/doc/ufuncs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/dual.py
-lib/python${MODPY_VERSION}/site-packages/numpy/dual.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}auxfuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}capi_maps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}cb_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}cfuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}common_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}crackfortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}diagnose.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}f2py2e.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}f2py_testing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}f90mod_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}func2subr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/f2py/${MODPY_PYCACHE}use_rules.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/__version__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/__version__.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/auxfuncs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/auxfuncs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/capi_maps.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/capi_maps.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/cb_rules.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/cb_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/cfuncs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/cfuncs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/common_rules.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/common_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/crackfortran.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/crackfortran.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/diagnose.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/diagnose.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/docs/
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/docs/FAQ.txt
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/docs/HISTORY.txt
@@ -421,21 +441,12 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/numpy/f2py/docs/usersguide/var_session.dat
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f2py.1
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f2py2e.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f2py2e.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f2py_testing.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f2py_testing.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f90mod_rules.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/f90mod_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/func2subr.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/func2subr.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/rules.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/rules.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/src/
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/src/fortranobject.c
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/src/fortranobject.h
@@ -470,71 +481,72 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/test_size.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/tests/util.py
 lib/python${MODPY_VERSION}/site-packages/numpy/f2py/use_rules.py
-lib/python${MODPY_VERSION}/site-packages/numpy/f2py/use_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}fftpack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/fft/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/fftpack_lite.so
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/helper.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/helper.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/fft/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/tests/test_fftpack.py
 lib/python${MODPY_VERSION}/site-packages/numpy/fft/tests/test_helper.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}_datasource.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}_iotools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}arraypad.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}arraysetops.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}arrayterator.${MODPY_PYC_MAGIC_TAG}pyc
+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}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}nanfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}npyio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}polynomial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}recfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}scimath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}shape_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}stride_tricks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}twodim_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}type_check.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}ufunclike.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}user_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/_compiled_base.so
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/_datasource.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/_datasource.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/_iotools.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/_iotools.pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/arraypad.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/arraysetops.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/arraysetops.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/arrayterator.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/arrayterator.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/benchmark.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/casting.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/creating.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/simpleindex.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/benchmarks/sorting.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/financial.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/format.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/function_base.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/index_tricks.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/info.pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/nanfunctions.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/npyio.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/npyio.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/polynomial.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/polynomial.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/recfunctions.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/recfunctions.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/scimath.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/scimath.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/shape_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/shape_base.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/stride_tricks.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/stride_tricks.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test__datasource.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test__iotools.py
+lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_arraypad.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_arraysetops.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_arrayterator.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_financial.py
@@ -542,6 +554,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_function_base.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_nanfunctions.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_polynomial.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_recfunctions.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_regression.py
@@ -552,46 +565,44 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_ufunclike.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/tests/test_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/twodim_base.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/twodim_base.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/type_check.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/type_check.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/ufunclike.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/ufunclike.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/user_array.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/user_array.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/lib/utils.py
-lib/python${MODPY_VERSION}/site-packages/numpy/lib/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}linalg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/_umath_linalg.so
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/lapack_lite.so
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/linalg.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/linalg.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/linalg/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/test_build.py
+lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/test_deprecations.py
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/test_linalg.py
 lib/python${MODPY_VERSION}/site-packages/numpy/linalg/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}bench.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}extras.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}mrecords.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}testutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}timer_comparison.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/ma/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/bench.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/bench.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/core.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/core.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/extras.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/extras.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/mrecords.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/mrecords.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/tests/test_core.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/tests/test_extras.py
@@ -600,22 +611,17 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/tests/test_subclassing.py
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/testutils.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/testutils.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/timer_comparison.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/timer_comparison.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/ma/version.py
-lib/python${MODPY_VERSION}/site-packages/numpy/ma/version.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/matlib.py
-lib/python${MODPY_VERSION}/site-packages/numpy/matlib.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/${MODPY_PYCACHE}defmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/defmatrix.py
-lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/defmatrix.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/
 
lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_defmatrix.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_multiarray.py
@@ -623,22 +629,34 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/numpy/matrixlib/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}alter_code1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}alter_code2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}convolve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}fft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}image.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}linear_algebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}ma.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}mlab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}nd_image.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}numerictypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}random_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}ufuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/numarray/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/_capi.so
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/alter_code1.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/alter_code1.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/alter_code2.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/alter_code2.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/compat.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/convolve.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/convolve.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/fft.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/fft.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/functions.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/functions.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/image.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/image.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/include/
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/include/numpy/
 
lib/python${MODPY_VERSION}/site-packages/numpy/numarray/include/numpy/arraybase.h
@@ -648,152 +666,134 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/numpy/numarray/include/numpy/numcomplex.h
 
lib/python${MODPY_VERSION}/site-packages/numpy/numarray/include/numpy/nummacro.h
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/linear_algebra.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/linear_algebra.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/ma.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/ma.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/matrix.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/matrix.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/mlab.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/mlab.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/nd_image.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/nd_image.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/numerictypes.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/numerictypes.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/random_array.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/random_array.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/session.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/session.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/ufuncs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/ufuncs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/numarray/util.py
-lib/python${MODPY_VERSION}/site-packages/numpy/numarray/util.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}alter_code1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}alter_code2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}array_printer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}arrayfns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}fft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}fix_default_axis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}linear_algebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}ma.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}mlab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}precision.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}random_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}rng.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}rng_stats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}typeconv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}ufuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/${MODPY_PYCACHE}user_array.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/alter_code1.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/alter_code1.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/alter_code2.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/alter_code2.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/array_printer.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/array_printer.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/arrayfns.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/arrayfns.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/compat.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/fft.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/fft.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/fix_default_axis.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/fix_default_axis.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/functions.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/functions.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/linear_algebra.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/linear_algebra.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/ma.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/ma.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/matrix.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/matrix.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/misc.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/misc.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/mlab.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/mlab.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/precision.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/precision.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/random_array.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/random_array.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/rng.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/rng.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/rng_stats.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/rng_stats.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/tests/
 
lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/tests/test_oldnumeric.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/typeconv.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/typeconv.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/ufuncs.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/ufuncs.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/user_array.py
-lib/python${MODPY_VERSION}/site-packages/numpy/oldnumeric/user_array.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}chebyshev.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}hermite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}hermite_e.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}laguerre.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}legendre.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}polynomial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}polytemplate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}polyutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/chebyshev.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/chebyshev.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/hermite.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/hermite.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/hermite_e.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/hermite_e.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/laguerre.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/laguerre.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/legendre.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/legendre.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polynomial.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polynomial.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polytemplate.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polytemplate.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polyutils.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/polyutils.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/setup.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_chebyshev.py
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_classes.py
 lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_hermite.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_hermite_e.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_laguerre.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_legendre.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_polynomial.py
 
lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_polyutils.py
+lib/python${MODPY_VERSION}/site-packages/numpy/polynomial/tests/test_printing.py
 lib/python${MODPY_VERSION}/site-packages/numpy/random/
 lib/python${MODPY_VERSION}/site-packages/numpy/random/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/random/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/random/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/random/info.py
-lib/python${MODPY_VERSION}/site-packages/numpy/random/info.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/random/mtrand.so
 lib/python${MODPY_VERSION}/site-packages/numpy/random/randomkit.h
 lib/python${MODPY_VERSION}/site-packages/numpy/random/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/random/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/random/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/random/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/random/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/random/tests/test_random.py
 lib/python${MODPY_VERSION}/site-packages/numpy/random/tests/test_regression.py
 lib/python${MODPY_VERSION}/site-packages/numpy/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}noseclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}nosetester.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/${MODPY_PYCACHE}numpytest.${MODPY_PYC_MAGIC_TAG}pyc
+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/decorators.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/noseclasses.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nosetester.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nulltester.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/nulltester.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/numpytest.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/numpytest.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/print_coercion_tables.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/setup.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/setup.pyc
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/setupscons.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/setupscons.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/tests/
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/tests/test_decorators.py
+lib/python${MODPY_VERSION}/site-packages/numpy/testing/tests/test_doctesting.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/tests/test_utils.py
 lib/python${MODPY_VERSION}/site-packages/numpy/testing/utils.py
-lib/python${MODPY_VERSION}/site-packages/numpy/testing/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/numpy/tests/
 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/version.py
-lib/python${MODPY_VERSION}/site-packages/numpy/version.pyc

Re: [patch] math/py-numpy 1.6.0 -> 1.8.2

Reply via email to