Changes in setup.py [18e7309:db74ee8] in sasview

File:

• setup.py (modified) (10 diffs)

setup.py

@@ -9 +9 @@
 from distutils.command.build_ext import build_ext
 from distutils.core import Command
-import numpy
 
 # Manage version number ######################################
@@ -55 +54 @@
         print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
         shutil.rmtree(SASVIEW_BUILD)
-
+                    
 # 'sys.maxsize' and 64bit: Not supported for python2.5
 is_64bits = False
 if sys.version_info >= (2, 6):
     is_64bits = sys.maxsize > 2**32
-
+    
 enable_openmp = False
 
@@ -119 +118 @@
         c = self.compiler.compiler_type
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
-
+        
         # OpenMP build options
         if enable_openmp:
@@ -128 +127 @@
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]
-
+                    
         # Platform-specific build options
         if platform_lopt.has_key(c):
@@ -206 +205 @@
 )
 
-
+    
 # sas.sascalc.pr
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
@@ -218 +217 @@
                               include_dirs=[],
                               ) )
-
-# sas.sascalc.file_converter
-mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
-package_dir["sas.sascalc.file_converter.core"] = mydir
-package_dir["sas.sascalc.file_converter"] = os.path.join("src","sas", "sascalc", "file_converter")
-packages.extend(["sas.sascalc.file_converter","sas.sascalc.file_converter.core"])
-ext_modules.append( Extension("sas.sascalc.file_converter.core.bsl_loader",
-                              sources = [os.path.join(mydir, "bsl_loader.c")],
-                              include_dirs=[numpy.get_include()],
-                              ) )
-
+        
 # sas.sascalc.fit
 package_dir["sas.sascalc.fit"] = os.path.join("src", "sas", "sascalc", "fit")
@@ -250 +239 @@
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
-
+    
 # Data util
 package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
@@ -305 +294 @@
                                'test/2d_data/*',
                                'test/save_states/*',
-                               'test/upcoming_formats/*',
+                               'test/upcoming_formats/*', 
                                  'default_categories.json']
 packages.append("sas.sasview")
@@ -327 +316 @@
     required.extend(['pillow'])
 
-# Set up SasView
+# Set up SasView    
 setup(
     name="sasview",
@@ -352 +341 @@
                 'docs': BuildSphinxCommand,
                 'disable_openmp': DisableOpenMPCommand}
-    )
+    )