Changeset 80c2c85 in sasview for run.py

Timestamp:

Jun 28, 2016 5:10:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3aa2f3c

Parents:

899e084 (diff), 5552396 (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 sasview-cleanup

File:

• run.py (modified) (3 diffs)

run.py

@@ -107 +107 @@
     addpath(joinpath(root, '../sasmodels/'))
 
-    # Import the sasview package from root/sasview as sas.sasview.  It would
-    # be better to just store the package in src/sas/sasview.
-    import sas
-    sas.sasview = import_package('sas.sasview', joinpath(root,'sasview'))
-
     # The sas.models package Compiled Model files should be pulled in from the build directory even though
     # the source is stored in src/sas/models.
@@ -121 +116 @@
                                   joinpath(build_path, 'sas', 'sascalc', 'pr', 'core'))
 
-    # Compiled modules need to be pulled from the build directory.
-    # Some packages are not where they are needed, so load them explicitly.
     import sas.sascalc.calculator
     sas.sascalc.calculator.core = import_package('sas.sascalc.calculator.core',
@@ -133 +126 @@
 if __name__ == "__main__":
     prepare()
-    from sas.sasview.sasview import run
-    run()
+    from sas.sasview.sasview import run_gui
+    run_gui()