Changeset ed03b99 in sasview

Timestamp:

May 2, 2017 8:05:52 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:

7c105e8

Parents:

2f6d340

Message:

move logger config into root of sas so it is available immediately

Files:

• installers/setup_exe.py (modified) (1 diff)
• installers/setup_mac.py (modified) (1 diff)
• run.py (modified) (1 diff)
• setup.py (modified) (1 diff)

installers/setup_exe.py

@@ -222 +222 @@
 
 # Copy the config files
-sasview_path = os.path.join('..','src','sas','sasview')
+sas_path = os.path.join('..', 'src', 'sas')
+DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')]))
+sasview_path = os.path.join(sas_path,'sasview')
 config_files = [
     'custom_config.py',
     'local_config.py',
-    'logging.init',
     #'default_categories.json',
     ]

installers/setup_mac.py

@@ -62 +62 @@
 
 # Copy the config files
-sasview_path = os.path.join('..','src','sas','sasview')
+sas_path = os.path.join('..', 'src', 'sas')
+DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')]))
+sasview_path = os.path.join(sas_path,'sasview')
 custom_config_file = os.path.join(sasview_path, 'custom_config.py')
 local_config_file = os.path.join(sasview_path, 'local_config.py')

run.py

@@ -146 +146 @@
     # so logging can be done during initialization process too
     root = abspath(dirname(__file__))
-    addpath(joinpath(root, 'sasview'))
-    from logger_config import SetupLogger
+    addpath(joinpath(root, 'src'))
+    from sas.logger_config import SetupLogger
     logger = SetupLogger(__name__).config_development()
 

setup.py

@@ -370 +370 @@
 
 # SasView
+package_data['sas'] = ['logging.ini']
 package_data['sas.sasview'] = ['images/*',
                                'media/*',
-                               'logging.ini',
                                'test/*.txt',
                                'test/1d_data/*',