Changeset 0315b63 in sasview for installers

Timestamp:

Sep 25, 2017 5:24:46 PM (7 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:

24d9e84, fca1f50

Parents:

b277220 (diff), 66000ae (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 'ticket-887-reorg' into ticket-853-fit-gui-to-calc

Location:

installers

Files:

• setup_exe.py (modified) (2 diffs)
• setup_mac.py (modified) (1 diff)

installers/setup_exe.py

@@ -46 +46 @@
 sys.path.insert(0, build_path)
 
-from sas.sasview import local_config
 from installer_generator import generate_installer
 
@@ -74 +73 @@
           sys.exc_value)
 
+from sas import get_local_config
+local_config = get_local_config()
 
 # Solution taken from here: http://www.py2exe.org/index.cgi/win32com.shell

installers/setup_mac.py

@@ -45 +45 @@
 import macholib_patch
 
-from sas.sasview import local_config
+from sas import get_local_config
+local_config = get_local_config()
 
 ICON = local_config.SetupIconFile_mac