Changeset e5ea2d0 in sasview for setup.py

Timestamp:

Mar 16, 2016 9:24:07 AM (9 years ago)

Author:

ajj

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:

a301204

Parents:

f66d9d1 (diff), 55c7d4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sasmodels-integration

File:

• setup.py (modified) (3 diffs, 1 prop)

setup.py

@@ -164 +164 @@
 packages.append("sas")
 
-# sas.invariant
-package_dir["sas.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
-packages.extend(["sas.invariant"])
+# sas module
+package_dir["sas.sasgui"] = os.path.join("src", "sas", "sasgui")
+packages.append("sas.sasgui")
+
+# sas module
+package_dir["sas.sascalc"] = os.path.join("src", "sas", "sascalc")
+packages.append("sas.sascalc")
+
+# sas.sascalc.invariant
+package_dir["sas.sascalc.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
+packages.extend(["sas.sascalc.invariant"])
 
 # sas.sasgui.guiframe
@@ -181 +189 @@
         package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", d)
 
-# sas.dataloader
-package_dir["sas.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
-package_data["sas.dataloader.readers"] = ['defaults.json','schema/*.xsd']
-packages.extend(["sas.dataloader","sas.dataloader.readers","sas.dataloader.readers.schema"])
-
-# sas.calculator
-package_dir["sas.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
+# sas.sascalc.dataloader
+package_dir["sas.sascalc.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
+package_data["sas.sascalc.dataloader.readers"] = ['defaults.json','schema/*.xsd']
+packages.extend(["sas.sascalc.dataloader","sas.sascalc.dataloader.readers","sas.sascalc.dataloader.readers.schema"])
+
+# sas.sascalc.calculator
+package_dir["sas.sascalc.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
 packages.extend(["sas.sascalc.calculator"])
     
@@ -227 +235 @@
     
 # Data util
-package_dir["data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
+package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
 packages.append("sas.sascalc.data_util")