Changeset d85c194 in sasview for setup.py

Timestamp:

Feb 22, 2016 9:04:24 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

06aaa75d

Parents:

d7bb526

Message:

Remaining modules refactored

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -168 +168 @@
 packages.extend(["sas.invariant"])
 
-# sas.guiframe
-guiframe_path = os.path.join("src", "sas", "guiframe")
-package_dir["sas.guiframe"] = guiframe_path
-package_dir["sas.guiframe.local_perspectives"] = os.path.join(os.path.join(guiframe_path, "local_perspectives"))
-package_data["sas.guiframe"] = ['images/*', 'media/*']
-packages.extend(["sas.guiframe", "sas.guiframe.local_perspectives"])
+# sas.sasgui.guiframe
+guiframe_path = os.path.join("src", "sas", "sasgui", "guiframe")
+package_dir["sas.sasgui.guiframe"] = guiframe_path
+package_dir["sas.sasgui.guiframe.local_perspectives"] = os.path.join(os.path.join(guiframe_path, "local_perspectives"))
+package_data["sas.sasgui.guiframe"] = ['images/*', 'media/*']
+packages.extend(["sas.sasgui.guiframe", "sas.sasgui.guiframe.local_perspectives"])
 # build local plugin
 for d in os.listdir(os.path.join(guiframe_path, "local_perspectives")):
     if d not in ['.svn','__init__.py', '__init__.pyc']:
-        package_name = "sas.guiframe.local_perspectives." + d
+        package_name = "sas.sasgui.guiframe.local_perspectives." + d
         packages.append(package_name)
         package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", d)
@@ -208 +208 @@
 
 # Perspectives
-package_dir["sas.perspectives"] = os.path.join("src", "sas", "perspectives")
-package_dir["sas.perspectives.pr"] = os.path.join("src", "sas", "perspectives", "pr")
-packages.extend(["sas.perspectives","sas.perspectives.pr"])
-package_data["sas.perspectives.pr"] = ['images/*']
-
-package_dir["sas.perspectives.invariant"] = os.path.join("src", "sas", "perspectives", "invariant")
-packages.extend(["sas.perspectives.invariant"])
-package_data['sas.perspectives.invariant'] = [os.path.join("media",'*')]
-
-package_dir["sas.perspectives.fitting"] = os.path.join("src", "sas", "perspectives", "fitting")
-package_dir["sas.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "perspectives", "fitting", "plugin_models")
-packages.extend(["sas.perspectives.fitting", 
-                 "sas.perspectives.fitting.plugin_models"])
-package_data['sas.perspectives.fitting'] = ['media/*','plugin_models/*']
-
-packages.extend(["sas.perspectives", "sas.perspectives.calculator"])    
-package_data['sas.perspectives.calculator'] = ['images/*', 'media/*']
+package_dir["sas.sasgui.perspectives"] = os.path.join("src", "sas", "sasgui", "perspectives")
+package_dir["sas.sasgui.perspectives.pr"] = os.path.join("src", "sas", "sasgui", "perspectives", "pr")
+packages.extend(["sas.sasgui.perspectives","sas.sasgui.perspectives.pr"])
+package_data["sas.sasgui.perspectives.pr"] = ['images/*']
+
+package_dir["sas.sasgui.perspectives.invariant"] = os.path.join("src", "sas", "sasgui", "perspectives", "invariant")
+packages.extend(["sas.sasgui.perspectives.invariant"])
+package_data['sas.sasgui.perspectives.invariant'] = [os.path.join("media",'*')]
+
+package_dir["sas.sasgui.perspectives.fitting"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting")
+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"])    
+package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
     
 # Data util