Changeset a7c4ad2 in sasview

Timestamp:

Apr 26, 2016 4:41:22 AM (9 years ago)

Author:

trnielsen

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:

628acad

Parents:

243fbc0

Message:

Fixed some Windows issues for setupSasView.exe by reversing earlier commits

Files:

• sasview/setup_exe.py (modified) (2 diffs)
• setup.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/__init__.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added)

sasview/setup_exe.py

@@ -256 +256 @@
 data_files += guiframe.data_files()
 
-import sas.models as models
+#import sas.models as models
+import sasmodels.models as models
 data_files += models.data_files()
 
@@ -338 +339 @@
 packages = [
     'matplotlib', 'scipy', 'encodings', 'comtypes',
-    'win32com', 'xhtml2pdf', 'bumps',
+    'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas',
     ]
 packages.extend([

setup.py

@@ -249 +249 @@
 
 package_dir["sas.sasgui.perspectives.fitting"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting")
-packages.extend(["sas.sasgui.perspectives.fitting"])
-package_data['sas.sasgui.perspectives.fitting'] = ['media/*']
+package_dir["sas.sasgui.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting", "plugin_models")
+packages.extend(["sas.sasgui.perspectives.fitting", "sas.sasgui.perspectives.fitting.plugin_models"])
+package_data['sas.sasgui.perspectives.fitting'] = ['media/*', 'plugin_models/*']
 
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])

src/sas/sasgui/perspectives/fitting/__init__.py

@@ -39 +39 @@
     data_files = []
     path = os.path.dirname(__file__)
-    # p_path = os.path.join(path, 'plugin_models')
-    # for f in findall(p_path):
-    #     data_files.append(('plugin_models', [f]))
+    p_path = os.path.join(path, 'plugin_models')
+    for f in findall(p_path):
+        data_files.append(('plugin_models', [f]))
     # path = get_data_path(media="media")
     for f in findall(path):