Changeset a2a1c20 in sasview

Timestamp:

Aug 31, 2017 12:25:38 PM (7 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:

b39d32d5

Parents:

28b7048

Message:

make pkg_resources optional

Files:

• build_tools/jenkins_win64_build.bat (modified) (1 diff)
• installers/setup_exe.py (modified) (1 diff)
• src/sas/logger_config.py (modified) (2 diffs)
• src/sas/sasgui/plottools/config.py (modified) (1 diff)

build_tools/jenkins_win64_build.bat

@@ -1 +1 @@
 set PYTHON=python.exe
 set EASY_INSTALL=easy_install.exe
-set PYLINT= pylint.exe
+set PYLINT=pylint.exe
 set INNO="C:\util\inno\ISCC.exe"
 set GIT_SED=C:\"Program Files"\Git\bin\sed.exe

installers/setup_exe.py

@@ -291 +291 @@
     'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py',
     'win32com', 'xhtml2pdf', 'bumps', 'sasmodels', 'sas',
-    'pkg_resources',
     ]
 packages.extend([

src/sas/logger_config.py

@@ -5 +5 @@
 import os
 import os.path
-
-import pkg_resources
 
 
@@ -71 +69 @@
         # NotImplementedError: resource_filename() only supported for .egg, not .zip
         try:
+            import pkg_resources
             places_to_look_for_conf_file.append(
                 pkg_resources.resource_filename(__name__, filename))
+        except ImportError:
+            pass
         except NotImplementedError:
             pass

src/sas/sasgui/plottools/config.py

@@ -38 +38 @@
     import pkg_resources
     pkg_resources.require("matplotlib>=" + plot_version)
-except:
+except ImportError:
     from distutils.version import LooseVersion as Version
     if Version(matplotlib.__version__) < Version(plot_version):