Changeset ea5fa58 in sasview for setup.py

Timestamp:

Sep 20, 2012 11:22:02 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

bda809e

Parents:

b71a53b

Message:

category stuffs start working in interp. environment

File:

• setup.py (modified) (6 diffs)

setup.py

@@ -9 +9 @@
 from setuptools import setup, Extension, find_packages
 from distutils.command.build_ext import build_ext
-
-
-
 
 try:
@@ -49 +46 @@
 if os.path.isdir(sans_dir):
     f_path = os.path.join(sans_dir, "sasview.log")
+    if os.path.isfile(f_path):
+        os.remove(f_path)
+    f_path = os.path.join(sans_dir, "serialized_cat.p")
     if os.path.isfile(f_path):
         os.remove(f_path)
@@ -116 +116 @@
 package_dir["sans.guiframe.local_perspectives"] = os.path.join(guiframe_path, 
                                                         "local_perspectives")
-package_data["sans.guiframe"] = ['images/*', 
-                                 'media/*', 
-                                 'default_categories.p']
-
+package_data["sans.guiframe"] = ['images/*', 'media/*']
 packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"])
 # build local plugin
@@ -275 +272 @@
 package_dir["sans.models"] = model_dir
 
-package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", "sans", "models", "sans_extension")
+package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", 
+                                            "sans", "models", "sans_extension")
             
 package_data['sans.models'] = [os.path.join('media', "*.*")]
@@ -317 +315 @@
 
 package_dir["sans.sansview"] = "sansview"
-package_data['sans.sansview'] = ['images/*', 'media/*', 'test/*']
+package_data['sans.sansview'] = ['images/*', 'media/*', 'test/*', 
+                                 'default_categories.p']
 packages.append("sans.sansview")
 
@@ -329 +328 @@
 else:
     required.extend(['pil'])
-
-# sys.path.append(os.path.join('sansguiframe',
-#                              'src',
-#                              'sans',
-#                              'guiframe'))
-
-#install category stuff
-cat_install_path = os.path.join('sansguiframe', 'src',
-                                'sans','guiframe','CategoryInstaller.py')
-shutil.copy(cat_install_path, os.getcwd())
-
-from CategoryInstaller import CategoryInstaller
-CategoryInstaller.check_install(defaultfile = \
-                                    os.path.join('sansguiframe',
-                                                 'src',
-                                                 'sans',
-                                                 'guiframe',
-                                                 'default_categories.p'),
-                                modelsdir = \
-                                    os.path.join('fittingview',
-                                                 'src',
-                                                 'sans',
-                                                 'perspectives',
-                                                 'fitting'), 
-                                installed_models_dir = \
-                                    os.path.join('sansdataloader',
-                                                 'src',
-                                                 'sans',
-                                                 'dataloader',
-                                                 'readers') )
-
    
  # Set up SasView