Changeset e13ef7f in sasview

Timestamp:

Nov 29, 2011 5:10:00 PM (12 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:

93f02d51

Parents:

f489b9d

Message:

Re #5 fixing windows build

File:

• setup.py (modified) (1 diff)

setup.py

@@ -7 +7 @@
 #from distutils.core import setup, Extension
 from setuptools import setup, Extension, find_packages
-
-if sys.platform is not 'win32':
+try:
+    from numpy.distutils.misc_util import get_numpy_include_dirs
+    NUMPY_INC = get_numpy_include_dirs()[0]
+except:
     try:
-        from numpy.distutils.misc_util import get_numpy_include_dirs
-        NUMPY_INC = get_numpy_include_dirs()[0]
+        import numpy
+        NUMPY_INC = os.path.join(os.path.split(numpy.__file__)[0],"core","include")
     except:
-        try:
-            import numpy
-            NUMPY_INC = os.path.join(os.path.split(numpy.__file__)[0],"core","include")
-        except:
-            print "\nNumpy is needed to build SansView. Try easy_install numpy.\n  %s" % str(sys.exc_value)
-            sys.exit(0)
-else:
-    v_info = sys.version_info
-    NUMPY_INC = os.path.join("C:\\python%1g%1g\\Lib\\site-packages\\numpy\\core\\include" % (v_info[0], v_info[1]))
+        print "\nNumpy is needed to build SansView. Try easy_install numpy.\n  %s" % str(sys.exc_value)
+        sys.exit(0)
 
 package_dir = {}