[140948] trunk/dports/python/py-numpy

[michaelld at macports.org]

Revision: 140948
          https://trac.macports.org/changeset/140948
Author:   michaelld at macports.org
Date:     2015-10-06 08:32:18 -0700 (Tue, 06 Oct 2015)
Log Message:
-----------
py*-numpy: update to 1.10.0.

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile
    trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff
    trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2015-10-06 15:19:36 UTC (rev 140947)
+++ trunk/dports/python/py-numpy/Portfile	2015-10-06 15:32:18 UTC (rev 140948)
@@ -6,8 +6,7 @@
 PortGroup               github 1.0
 PortGroup               compilers 1.0
 
-github.setup            numpy numpy 1.9.2 v
-revision                2
+github.setup            numpy numpy 1.10.0 v
 name                    py-numpy
 categories-append       math
 license                 BSD
@@ -16,8 +15,8 @@
 description             The core utilities for the scientific library scipy for Python
 long_description        ${description}
 
-checksums               rmd160  43b83224b2c0b67662773bad3cfb03138b86013e \
-                        sha256  5587182f8a749702aff0d55187d1c6685b5484f299166b2ef66b80be14d162bc
+checksums               rmd160 57408d0b112e283569294d5068d0b390fe70a9c3 \
+                        sha256 2be94310588ba48fd3bf77ca32615401fdec22c43a8333700513da0506fd9f0e
 
 python.versions         26 27 33 34 35
 

Modified: trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	2015-10-06 15:19:36 UTC (rev 140947)
+++ trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	2015-10-06 15:32:18 UTC (rev 140948)
@@ -1,39 +1,20 @@
 --- numpy/f2py/setup.py
 +++ numpy/f2py/setup.py
-@@ -41,21 +41,21 @@ def configuration(parent_package='',top_
-                           )
+@@ -40,7 +40,7 @@
+     if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
+             'bdist_rpm')).intersection(sys.argv):
+         return '#!python'
+-    return '#!' + sys.executable
++    return '#!@@MPORTS_PYTHON@@'
  
+ 
+ def configuration(parent_package='', top_path=None):
+@@ -55,7 +55,7 @@
      config.make_svn_version_py()
  
      def generate_f2py_py(build_dir):
--        f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
+-        f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:]
 +        f2py_exe = 'f2py'
-         if f2py_exe[-4:]=='.exe':
+         if f2py_exe[-4:] == '.exe':
              f2py_exe = f2py_exe[:-4] + '.py'
          if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
-             f2py_exe = f2py_exe + '.py'
-         target = os.path.join(build_dir, f2py_exe)
-         if newer(__file__, target):
-             log.info('Creating %s', target)
-             f = open(target, 'w')
-             f.write('''\
--#!%s
-+#!@@MPORTS_PYTHON@@
- # See http://cens.ioc.ee/projects/f2py2e/
- import os, sys
- for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
-     try:
-         i=sys.argv.index("--"+mode)
-@@ -75,11 +75,11 @@ elif mode=="2e-numpy":
-     from numpy.f2py import main
- else:
-     sys.stderr.write("Unknown mode: " + repr(mode) + "\\n")
-     sys.exit(1)
- main()
--'''%(sys.executable))
-+''')
-             f.close()
-         return target
- 
-     config.add_scripts(generate_f2py_py)
- 

Modified: trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff	2015-10-06 15:19:36 UTC (rev 140947)
+++ trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff	2015-10-06 15:32:18 UTC (rev 140948)
@@ -1,6 +1,6 @@
 --- numpy/core/setup.py.orig	2014-03-25 19:03:06.000000000 -0400
 +++ numpy/core/setup.py	2014-03-25 19:03:26.000000000 -0400
-@@ -485,7 +485,14 @@
+@@ -473,7 +473,14 @@
                  if isinstance(d, str):
                      target_f.write('#define %s\n' % (d))
                  else:
@@ -16,7 +16,7 @@
  
              # define inline to our keyword, or nothing
              target_f.write('#ifndef __cplusplus\n')
-@@ -585,7 +592,14 @@
+@@ -573,7 +580,14 @@
                  if isinstance(d, str):
                      target_f.write('#define %s\n' % (d))
                  else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151006/38a28116/attachment.html>