[Numpy-svn] r5502 - branches/1.1.x/numpy/f2py

numpy-svn@scip... numpy-svn@scip...
Tue Jul 22 14:47:57 CDT 2008


Author: charris
Date: 2008-07-22 14:47:54 -0500 (Tue, 22 Jul 2008)
New Revision: 5502

Modified:
   branches/1.1.x/numpy/f2py/f2py2e.py
   branches/1.1.x/numpy/f2py/setup.py
   branches/1.1.x/numpy/f2py/setupscons.py
Log:
Backport r5357: f2py removal part 1.

Modified: branches/1.1.x/numpy/f2py/f2py2e.py
===================================================================
--- branches/1.1.x/numpy/f2py/f2py2e.py	2008-07-22 18:18:42 UTC (rev 5501)
+++ branches/1.1.x/numpy/f2py/f2py2e.py	2008-07-22 19:47:54 UTC (rev 5502)
@@ -69,11 +69,11 @@
 
 Options:
 
-  --g3-numpy       Use numpy.f2py.lib tool, the 3rd generation of F2PY,
-                   with NumPy support.
   --2d-numpy       Use numpy.f2py tool with NumPy support. [DEFAULT]
   --2d-numeric     Use f2py2e tool with Numeric support.
   --2d-numarray    Use f2py2e tool with Numarray support.
+  --g3-numpy       Use 3rd generation f2py from the separate f2py package.
+                   [NOT AVAILABLE YET]
 
   -h <filename>    Write signatures of the fortran routines to file <filename>
                    and exit. You can then edit <filename> and use it instead

Modified: branches/1.1.x/numpy/f2py/setup.py
===================================================================
--- branches/1.1.x/numpy/f2py/setup.py	2008-07-22 18:18:42 UTC (rev 5501)
+++ branches/1.1.x/numpy/f2py/setup.py	2008-07-22 19:47:54 UTC (rev 5502)
@@ -63,10 +63,8 @@
     except ValueError: pass
 os.environ["NO_SCIPY_IMPORT"]="f2py"
 if mode=="g3-numpy":
-    try:
-        from main import main
-    except ImportError:
-        from numpy.f2py.lib.api import main
+    print >> sys.stderr, "G3 f2py support is not implemented, yet."
+    sys.exit(1)
 elif mode=="2e-numeric":
     from f2py2e import main
 elif mode=="2e-numarray":

Modified: branches/1.1.x/numpy/f2py/setupscons.py
===================================================================
--- branches/1.1.x/numpy/f2py/setupscons.py	2008-07-22 18:18:42 UTC (rev 5501)
+++ branches/1.1.x/numpy/f2py/setupscons.py	2008-07-22 19:47:54 UTC (rev 5502)
@@ -61,10 +61,8 @@
     except ValueError: pass
 os.environ["NO_SCIPY_IMPORT"]="f2py"
 if mode=="g3-numpy":
-    try:
-        from main import main
-    except ImportError:
-        from numpy.f2py.lib.api import main
+    print >> sys.stderr, "G3 f2py support is not implemented, yet."
+    sys.exit(1)
 elif mode=="2e-numeric":
     from f2py2e import main
 elif mode=="2e-numarray":



More information about the Numpy-svn mailing list