Changeset 2a8b4756 in sasview

Timestamp:

Apr 10, 2017 10:21:10 AM (8 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:

0505fce

Parents:

c04fb72

Message:

fixing package resources for OSx

Files:

• sasview/logger_config.py (modified) (1 diff)
• setup.py (modified) (1 diff)

sasview/logger_config.py

@@ -56 +56 @@
         '''
         '''
-        for filepath in [
-                os.path.join(os.path.abspath(os.path.dirname(__file__)), filename),
-                pkg_resources.resource_filename(__name__, filename),
-            ]:
+        places_to_look_for_conf_file = [
+            os.path.join(os.path.abspath(os.path.dirname(__file__)), filename),
+            os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", filename),
+            os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", filename),
+        ]
+
+        # To avoid the exception in OSx
+        # NotImplementedError: resource_filename() only supported for .egg, not .zip
+        try:
+            places_to_look_for_conf_file.append(
+                pkg_resources.resource_filename(__name__, filename))
+        except NotImplementedError:
+            pass
+
+        for filepath in places_to_look_for_conf_file:
             if os.path.exists(filepath):
                 self.config_file = filepath

setup.py

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