- Timestamp:
- Oct 24, 2017 12:44:26 AM (6 years ago)
- Branches:
- 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
- Children:
- fca1f50, d6b234b
- Parents:
- 16afe01 (diff), 5582b078 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
run.py
- Property mode changed from 100755 to 100644
r2a8bd705 rf4a1433 119 119 # be better to just store the package in src/sas/sasview. 120 120 import sas 121 sas.sasview = import_package('sas.sasview', joinpath(root, 'sasview')) 121 #sas.sasview = import_package('sas.sasview', joinpath(root, 'sasview')) 122 sas.sasview = import_package('sas.sasview', joinpath(root, 'src','sas','sasview')) 122 123 123 124 # Compiled modules need to be pulled from the build directory. … … 145 146 # so logging can be done during initialization process too 146 147 root = abspath(dirname(realpath(sys.argv[0]))) 147 addpath(joinpath(root, 's asview'))148 addpath(joinpath(root, 'src','sas')) 148 149 from logger_config import SetupLogger 149 150 logger = SetupLogger(__name__).config_development()
Note: See TracChangeset
for help on using the changeset viewer.