Changeset f567f92f in sasview

Timestamp:

May 6, 2016 2:22:36 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

e791cca

Parents:

b523c0e

Message:

numpy not included in C code, so no need for numpy headers

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -9 +9 @@
 from distutils.command.build_ext import build_ext
 from distutils.core import Command
-from shutil import rmtree
 
 try:
     from numpy.distutils.misc_util import get_numpy_include_dirs
-    NUMPY_INC = get_numpy_include_dirs()[0]
-except:
-    try:
-        import numpy
-        NUMPY_INC = os.path.join(os.path.split(numpy.__file__)[0], 
-                                 "core","include")
-    except:
-        msg = "\nNumpy is needed to build SasView. "
-        print msg, "Try easy_install numpy.\n  %s" % str(sys.exc_value)
-        sys.exit(0)
+except ImportError:
+    pass
 
 # Manage version number ######################################
@@ -204 +195 @@
 
 # sas.sascalc.calculator
-numpy_incl_path = os.path.join(NUMPY_INC, "numpy")
 gen_dir = os.path.join("src", "sas", "sascalc", "calculator", "c_extensions")
 package_dir["sas.sascalc.calculator.core"] = gen_dir
@@ -216 +206 @@
             os.path.join(gen_dir, "librefl.c"),
         ],
-        include_dirs=[numpy_incl_path, gen_dir],
+        include_dirs=[gen_dir],
     )
 )
@@ -230 +220 @@
                                          os.path.join(srcdir, "invertor.c"),
                                          ],
-                              include_dirs=[numpy_incl_path],
+                              include_dirs=[],
                               ) )