[hdf-compass] 270/295: Made runtime-optional cartopy for GeoArray

[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 0a8f322abdd5597b26eb28963ff81a52715431f4
Author: giumas <giumas at yahoo.it>
Date:   Sat Mar 26 16:27:28 2016 -0400

    Made runtime-optional cartopy for GeoArray
---
 hdf_compass/compass_viewer/geo_array/plot.py   | 7 +++++--
 hdf_compass/compass_viewer/geo_surface/plot.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hdf_compass/compass_viewer/geo_array/plot.py b/hdf_compass/compass_viewer/geo_array/plot.py
index 9bc6e20..cc0141e 100644
--- a/hdf_compass/compass_viewer/geo_array/plot.py
+++ b/hdf_compass/compass_viewer/geo_array/plot.py
@@ -17,8 +17,11 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 
 import numpy as np
 import wx
-import cartopy.crs as ccrs
-from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
+try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
+    import cartopy.crs as ccrs
+    from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
+except ImportError:
+    pass
 import matplotlib.pyplot as plt
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigCanvas
diff --git a/hdf_compass/compass_viewer/geo_surface/plot.py b/hdf_compass/compass_viewer/geo_surface/plot.py
index aa79b98..3670c65 100644
--- a/hdf_compass/compass_viewer/geo_surface/plot.py
+++ b/hdf_compass/compass_viewer/geo_surface/plot.py
@@ -19,9 +19,9 @@ import numpy as np
 import wx
 try:  # for GeoSurface we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
     import cartopy.crs as ccrs
+    from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
 except ImportError:
     pass
-from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
 import matplotlib.pyplot as plt
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigCanvas

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