Changeset 9e531f2 in sasview for run.py

Timestamp:

Mar 20, 2016 3:59:32 PM (8 years ago)

Author:

krzywon

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:

b85502d

Parents:

0b709f2c

Message:

Code Cleanup - Fix build?!?!

File:

• run.py (modified) (1 diff)

run.py

@@ -121 +121 @@
                                   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',
+                                  joinpath(build_path, 'sas', 'sascalc', 'calculator', 'core'))
 
     # Pull the entire sas.models package from the build directory since it contains
     # a mixture of autogenerated python and C.  Any changes in models will require
     # a rebuild with setup.py build
-    sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models'))
+    # sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models'))
 
     sys.path.append(build_path)