Changeset 3371d81 in sasview for setup.py

Timestamp:

May 9, 2016 4:59:33 AM (8 years ago)

Author:

wojciech

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:

aa4a549

Parents:

aff7904 (diff), 1d5f5c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

setup.py fixed. Merged with Master

File:

• setup.py (modified) (8 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)
 
 # Manage version number ######################################
@@ -204 +190 @@
 
 # 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
@@ -215 +200 @@
             os.path.join(gen_dir, "libfunc.c"),
             os.path.join(gen_dir, "librefl.c"),
-            os.path.join(gen_dir, "winFuncs.c"),
         ],
-        include_dirs=[numpy_incl_path, gen_dir],
+        include_dirs=[gen_dir],
     )
 )
@@ -231 +215 @@
                                          os.path.join(srcdir, "invertor.c"),
                                          ],
-                              include_dirs=[numpy_incl_path],
+                              include_dirs=[],
                               ) )
         
@@ -267 +251 @@
 # package_dir["sas.models"] = os.path.join("src", "sas", "models")
 # packages.append("sas.models")
-
-IGNORED_FILES = [".svn"]
-if not os.name=='nt':
-    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
 
 EXTENSIONS = [".c", ".cpp"]
@@ -281 +261 @@
         if os.path.isfile(os.path.join(dir_path, f)):
             _, ext = os.path.splitext(f)
-            if ext.lower() in EXTENSIONS and f not in IGNORED_FILES:
+            if ext.lower() in EXTENSIONS:
                 file_list.append(os.path.join(dir_path, f))
         elif os.path.isdir(os.path.join(dir_path, f)) and \
@@ -289 +269 @@
                 if os.path.isfile(os.path.join(sub_dir, new_f)):
                     _, ext = os.path.splitext(new_f)
-                    if ext.lower() in EXTENSIONS and\
-                         new_f not in IGNORED_FILES:
+                    if ext.lower() in EXTENSIONS:
                         file_list.append(os.path.join(sub_dir, new_f))
 
@@ -334 +313 @@
     required.extend(['html5lib', 'reportlab'])
 else:
-    required.extend(['pil'])
+    # 'pil' is now called 'pillow'
+    required.extend(['pillow'])
 
 # Set up SasView