Changeset df7a7e3 in sasview for setup.py

Timestamp:

Sep 17, 2012 5:11:50 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:

b71a53b

Parents:

cf7653d3

Message:

merging category branch

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -4 +4 @@
 """
 import sys
-
 import os
 import platform
+import shutil
 from setuptools import setup, Extension, find_packages
 from distutils.command.build_ext import build_ext
+
+
+
 
 try:
@@ -113 +116 @@
 package_dir["sans.guiframe.local_perspectives"] = os.path.join(guiframe_path, 
                                                         "local_perspectives")
-package_data["sans.guiframe"] = ['images/*', 'media/*']
+package_data["sans.guiframe"] = ['images/*', 
+                                 'media/*', 
+                                 'default_categories.p']
+
 packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"])
 # build local plugin
@@ -279 +285 @@
                   os.path.join(smear_dir, "smearer_module.cpp")]
 
-# compile list of installed models
-installed_model_file = open(os.path.join("sansmodels",
-                                         "installed_models.txt"),'w')
-not_models = ['BaseComponent',
-              'sans_extension',
-              'MulComponent',
-              'svn',
-              'media',
-              'SubComponent',
-              '__init__',
-              'dispersion_models',
-              'AddComponent',
-              'qsmearing']
-
-for model in os.listdir(model_dir):
-    if not model.rstrip(".py") in not_models:
-        installed_model_file.write(model.rstrip(".py") + '\n')
-
-installed_model_file.close()
+
+
+
+
 
 if os.name=='nt':
@@ -324 +315 @@
         
 # SasView
+
 package_dir["sans.sansview"] = "sansview"
 package_data['sans.sansview'] = ['images/*', 'media/*', 'test/*']
@@ -338 +330 @@
     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') )