[Numpy-svn] r5376 - in branches/1.1.x/numpy: distutils/command fft lib linalg numarray random

numpy-svn@scip... numpy-svn@scip...
Wed Jul 9 05:36:59 CDT 2008


Author: cdavid
Date: 2008-07-09 05:36:41 -0500 (Wed, 09 Jul 2008)
New Revision: 5376

Modified:
   branches/1.1.x/numpy/distutils/command/scons.py
   branches/1.1.x/numpy/fft/SConscript
   branches/1.1.x/numpy/lib/SConscript
   branches/1.1.x/numpy/linalg/SConscript
   branches/1.1.x/numpy/numarray/SConscript
   branches/1.1.x/numpy/random/SConscript
Log:
More backporting of scons changes: require 0.8.2

Modified: branches/1.1.x/numpy/distutils/command/scons.py
===================================================================
--- branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 10:36:41 UTC (rev 5376)
@@ -338,13 +338,18 @@
                                    "this package " % str(e))
 
             try:
+                minver = "0.8.2"
                 from numscons import get_version
-                if get_version() < '0.8.0':
+                if get_version() < minver:
                     raise ValueError()
-            except ImportError, ValueError:
-                raise RuntimeError("You need numscons >= 0.8.0 to build numpy "\
+            except ImportError:
+                raise RuntimeError("You need numscons >= %s to build numpy "\
                                    "with numscons (imported numscons path " \
-                                   "is %s)." % numscons.__file__)
+                                   "is %s)." % (minver, numscons.__file__))
+            except ValueError:
+                raise RuntimeError("You need numscons >= %s to build numpy "\
+                                   "with numscons (detected %s )" \
+                                   % (minver, get_version()))
                 
         else:
             # nothing to do, just leave it here.

Modified: branches/1.1.x/numpy/fft/SConscript
===================================================================
--- branches/1.1.x/numpy/fft/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/fft/SConscript	2008-07-09 10:36:41 UTC (rev 5376)
@@ -1,10 +1,8 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
-fftpack_lite = env.DistutilsPythonExtension('fftpack_lite', 
-                                        source = ['fftpack_litemodule.c', 
-                                                  'fftpack.c'])
+env.NumpyPythonExtension('fftpack_lite', 
+			  source = ['fftpack_litemodule.c', 'fftpack.c'])

Modified: branches/1.1.x/numpy/lib/SConscript
===================================================================
--- branches/1.1.x/numpy/lib/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/lib/SConscript	2008-07-09 10:36:41 UTC (rev 5376)
@@ -1,9 +1,6 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-_compiled_base = env.DistutilsPythonExtension('_compiled_base', 
-                                        source = ['src/_compiled_base.c'])
+env.NumpyPythonExtension('_compiled_base', source = ['src/_compiled_base.c'])

Modified: branches/1.1.x/numpy/linalg/SConscript
===================================================================
--- branches/1.1.x/numpy/linalg/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/linalg/SConscript	2008-07-09 10:36:41 UTC (rev 5376)
@@ -1,17 +1,12 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-import os.path
-
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                     scons_get_mathlib
+from numscons import GetNumpyEnvironment, scons_get_mathlib
 from numscons import CheckF77LAPACK
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
-config = env.NumpyConfigure(custom_tests = 
-    {'CheckLAPACK' : CheckF77LAPACK})
+config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
 
 use_lapack = config.CheckLAPACK()
 
@@ -25,5 +20,4 @@
 if not use_lapack:
     sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
                     'blas_lite.c', 'dlamch.c', 'f2c_lite.c'])
-lapack_lite = env.DistutilsPythonExtension('lapack_lite', source = sources)
-            
+env.NumpyPythonExtension('lapack_lite', source = sources)

Modified: branches/1.1.x/numpy/numarray/SConscript
===================================================================
--- branches/1.1.x/numpy/numarray/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/numarray/SConscript	2008-07-09 10:36:41 UTC (rev 5376)
@@ -1,9 +1,8 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 env.Append(CPPPATH = ['numpy'])
 
-_capi = env.DistutilsPythonExtension('_capi', source = ['_capi.c'])
+env.NumpyPythonExtension('_capi', source = ['_capi.c'])

Modified: branches/1.1.x/numpy/random/SConscript
===================================================================
--- branches/1.1.x/numpy/random/SConscript	2008-07-09 10:25:26 UTC (rev 5375)
+++ branches/1.1.x/numpy/random/SConscript	2008-07-09 10:36:41 UTC (rev 5376)
@@ -2,8 +2,7 @@
 # vim:syntax=python
 import os
 
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                                  scons_get_mathlib
+from numscons import GetNumpyEnvironment, scons_get_mathlib
 
 def CheckWincrypt(context):
     from copy import deepcopy
@@ -28,7 +27,6 @@
     return st[0]
     
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
 mlib = scons_get_mathlib(env)
 env.AppendUnique(LIBS = mlib)
@@ -43,4 +41,4 @@
            ['mtrand.c', 'randomkit.c', 'initarray.c', 'distributions.c']]
 
 # XXX: Pyrex dependency
-mtrand = env.DistutilsPythonExtension('mtrand', source = sources)
+env.NumpyPythonExtension('mtrand', source = sources)



More information about the Numpy-svn mailing list