Changeset cb5fb4a in sasview

Timestamp:

Nov 22, 2011 5:34:33 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

82905ee

Parents:

641166b

Message:

Re #5 Fixing setup for build server

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -9 +9 @@
 try:
     from numpy.distutils.misc_util import get_numpy_include_dirs
+    NUMPY_INC = get_numpy_include_dirs()[0]
 except:
-    print "\nNumpy is needed to build SansView. Try easy_install numpy.\n"
-    sys.exit(0)
+    try:
+        import numpy
+        NUMPY_INC = os.path.join(os.path.split(numpy.__file__),"core","include")
+    except:
+        print "\nNumpy is needed to build SansView. Try easy_install numpy.\n"
+        sys.exit(0)
 
 package_dir = {}
@@ -47 +52 @@
     
 # sans.pr
-numpy_incl_path = os.path.join(get_numpy_include_dirs()[0], "numpy")
+numpy_incl_path = os.path.join(NUMPY_INC, "numpy")
 srcdir  = os.path.join("pr_inversion", "src", "sans", "pr", "c_extensions")
 
@@ -186 +191 @@
 
 required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 'wxPython>=2.8.11',
-            'pil','periodictable>=1.3.0']
+            'pil','periodictable>=1.3.0', 'scipy>=0.7.2']
 if sys.platform=='win32':
     required.extend(['comtypes','pywin32', 'pisa', 'html5lib', 'reportlab'])