[hdf-compass] 274/295: Removed lxml workaround from pyinstaller specs + made cartopy optional

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository hdf-compass.

commit 8e5f2b729e44051bddc14cb6670c1009a7b265dc
Author: giumas <giumas at yahoo.it>
Date:   Sat Apr 23 11:00:34 2016 -0400

    Removed lxml workaround from pyinstaller specs + made cartopy optional
---
 HDFCompass.1file.spec                | 9 ++++++---
 HDFCompass.1folder.spec              | 9 ++++++---
 hdf_compass/compass_viewer/viewer.py | 2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/HDFCompass.1file.spec b/HDFCompass.1file.spec
index 725f258..3ba533d 100644
--- a/HDFCompass.1file.spec
+++ b/HDFCompass.1file.spec
@@ -50,8 +50,12 @@ def collect_pkg_data(package, include_py_files=False, subdir=None):
     return data_toc
 
 pkg_data_hdf_compass = collect_pkg_data('hdf_compass')
-pkg_data_lxml = collect_pkg_data('lxml')  # temporary patch: https://github.com/pyinstaller/pyinstaller/issues/1613
-cartopy_aux = collect_pkg_data('cartopy')
+cartopy_aux = None
+try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
+    import cartopy.crs as ccrs
+    cartopy_aux = collect_pkg_data('cartopy')
+except (ImportError, OSError):
+    pass
 
 if is_darwin:
     icon_file = os.path.abspath('HDFCompass.icns')
@@ -77,7 +81,6 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           pkg_data_hdf_compass,
-          pkg_data_lxml,
           cartopy_aux,
           name=app_name,
           debug=False,
diff --git a/HDFCompass.1folder.spec b/HDFCompass.1folder.spec
index 0d9d581..320b75f 100644
--- a/HDFCompass.1folder.spec
+++ b/HDFCompass.1folder.spec
@@ -50,8 +50,12 @@ def collect_pkg_data(package, include_py_files=False, subdir=None):
     return data_toc
 
 pkg_data_hdf_compass = collect_pkg_data('hdf_compass')
-pkg_data_lxml = collect_pkg_data('lxml')  # temporary patch: https://github.com/pyinstaller/pyinstaller/issues/1613
-cartopy_aux = collect_pkg_data('cartopy')
+cartopy_aux = None
+try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
+    import cartopy.crs as ccrs
+    cartopy_aux = collect_pkg_data('cartopy')
+except (ImportError, OSError):
+    pass
 
 if is_darwin:
     icon_file = os.path.abspath('HDFCompass.icns')
@@ -82,7 +86,6 @@ coll = COLLECT(exe,
                a.zipfiles,
                a.datas,
                pkg_data_hdf_compass,
-               pkg_data_lxml,
                cartopy_aux,
                strip=None,
                upx=True,
diff --git a/hdf_compass/compass_viewer/viewer.py b/hdf_compass/compass_viewer/viewer.py
index d0876b8..538eb51 100644
--- a/hdf_compass/compass_viewer/viewer.py
+++ b/hdf_compass/compass_viewer/viewer.py
@@ -220,7 +220,7 @@ def load_plugins():
         log.debug("lxml %s (libxml %s, libxslt %s)"
                   % (etree.__version__, ".".join(str(i) for i in etree.LIBXML_VERSION),
                      ".".join(str(i) for i in etree.LIBXSLT_VERSION)))
-    except ImportError:
+    except (ImportError, OSError):
         log.warning("BAG plugin: NOT loaded")
 
     try:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-compass.git