Changeset e6a3c6c in sasview

Timestamp:

Apr 10, 2017 9:40:03 AM (7 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

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

Children:

cfa88ee

Parents:

0505fce

Message:

Adding logging as resource

Location:

sasview

Files:

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

sasview/logger_config.py

@@ -75 +75 @@
                 self.config_file = filepath
                 return
-        print("%s not found...", filename)
+        print("Logging.ini not found...")
         self.config_file = None

sasview/setup_mac.py

@@ -51 +51 @@
 RESOURCES_FILES.append(os.path.join(sas.sascalc.dataloader.readers.get_data_path(),'defaults.json'))
 
+RESOURCES_FILES.append('logging.ini')
+
 # Locate libxml2 library
 lib_locs = ['/usr/local/lib', '/usr/lib']
@@ -62 +64 @@
 
 APP = ['sasview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py', 'logging.ini']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")