[hdf-compass] 278/295: Merge pull request #158 from giumas/develop

[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 47fba5832cdeb602406c1f2775e4bc1794271943
Merge: c32f6db b5d42d7
Author: giumas <giumas at yahoo.it>
Date:   Sat Apr 23 21:24:11 2016 -0400

    Merge pull request #158 from giumas/develop
    
    Cartopy's plotting extra requirements, modifications to pyinstaller specs, bug fix to avoid crash in case of geos loading issue

 HDFCompass.1file.spec                          | 16 ++++++++++------
 HDFCompass.1folder.spec                        | 19 +++++++++++++------
 docs/conf.py                                   |  4 ++--
 hdf_compass/bag_model/model.py                 |  6 +++---
 hdf_compass/compass_viewer/geo_array/plot.py   |  2 +-
 hdf_compass/compass_viewer/geo_surface/plot.py |  2 +-
 hdf_compass/compass_viewer/viewer.py           |  2 +-
 hdf_compass/utils/__init__.py                  |  2 +-
 setup.cfg                                      |  4 ++--
 setup.py                                       | 10 +++++-----
 spec.json                                      | 11 ++++++-----
 11 files changed, 45 insertions(+), 33 deletions(-)

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