updated BAG library for hyo2.bag

HDFGroup · Dec 2, 2018 · fe9e7c8 · fe9e7c8
1 parent 830a34c
commit fe9e7c8
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -67,7 +67,7 @@ install:
   - conda config --add channels conda-forge
   # python packages
   - conda install -q h5py lxml numpy matplotlib pydap requests shapely proj4 geos cartopy setuptools gdal
-  - pip install --no-deps hyo.bag
+  - pip install --no-deps hyo2.bag
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         pip install wxPython;
     else

diff --git a/COPYING b/COPYING
@@ -96,11 +96,11 @@ Compass source code.
       Original source: http://docs.h5py.org/en/latest/licenses.html
       License type: BSD-style license
 
-    HydrOffice BAG (hyo.bag)
+    HydrOffice BAG (hyo2.bag)
       Provided by: G.Masetti, B.R.Calder, and contributors
       Copyright and license information: additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
-      Original source: https://bitbucket.org/ccomjhc/hyo_bag/raw/tip/COPYING.txt
-      License type: BSD-style license
+      Original source: https://github.com/hydroffice/hyo2_bag/raw/master/COPYING
+      License type: LGPL v3 license
 
     NumPy
       Provided by: NumPy Developers

diff --git a/HDFCompass.1file.spec b/HDFCompass.1file.spec
@@ -50,7 +50,7 @@ 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_bag = collect_pkg_data('hyo.bag')
+pkg_data_bag = collect_pkg_data('hyo2.bag')
 cartopy_aux = []
 try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
     import cartopy.crs as ccrs

diff --git a/HDFCompass.1folder.spec b/HDFCompass.1folder.spec
@@ -50,7 +50,7 @@ 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_bag = collect_pkg_data('hyo.bag')
+pkg_data_bag = collect_pkg_data('hyo2.bag')
 cartopy_aux = []
 try:  # for GeoArray we use cartopy that can be challenging to freeze on OSX to dependencies (i.e. geos)
     import cartopy.crs as ccrs

diff --git a/README.rst b/README.rst
@@ -48,7 +48,7 @@ You will need:
 * `wxPython Phoenix 4.0.0+ <https://github.com/wxWidgets/Phoenix>`_ (`PyPI <https://pypi.python.org/pypi/wxPython>`_ and `extra wheels for Linux <https://wxpython.org/pages/downloads/>`_)
 * `Cartopy <https://github.com/SciTools/cartopy>`_
 * `h5py <https://github.com/h5py/h5py>`_ *[HDF plugin]*
-* `hyo.bag <https://bitbucket.org/ccomjhc/hyo_bag>`_ *[BAG plugin]*
+* `hyo2.bag <https://bitbucket.org/ccomjhc/hyo_bag>`_ *[BAG plugin]*
 * `Pydap <https://github.com/robertodealmeida/pydap>`_ *[OPeNDAP plugin]* (>=3.3)
 * `Requests <https://github.com/kennethreitz/requests>`_ *[HDF Rest API plugin]*
 * `adios <https://github.com/ornladios/ADIOS>`_ *[ADIOS Plugin]* (Linux/OSX only)
@@ -73,7 +73,7 @@ build of python...".  In this case use the pythonw command:
 Note: on Mac, HDF Compass doesn't create an initial window, use the system Application
 menu to open a file or remote resource.
 
-Note: If you are using conda and see debug message like "No module anmed 'h5py'" with the h5py package installed,
+Note: If you are using conda and see debug message like "No module named 'h5py'" with the h5py package installed,
 install python.app: ``$ conda install python.app``
 
 

diff --git a/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt b/additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
@@ -1,10 +1,10 @@
 
 Copyright Notice and License Terms for 
-hyo.bag - BAG package for HydrOffice
+hyo2.bag - BAG package for HydrOffice
 
 -----------------------------------------------------------------------------
 
-hyo.bag
+hyo2.bag
 
 Copyright 2015 - G.Masetti and B.R.Calder.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -42,7 +42,7 @@ install:
 
   # Install dependencies
   - conda install -q h5py lxml numpy matplotlib pydap requests shapely proj4 geos cartopy setuptools gdal
-  - pip install --no-deps hyo.bag
+  - pip install --no-deps hyo2.bag
   - pip install wxPython
 
   # Add to path the current folder

diff --git a/docs/license.rst b/docs/license.rst
@@ -97,7 +97,7 @@ Compass source code.
       Original source: http://docs.h5py.org/en/latest/licenses.html
       License type: BSD-style license
 
-    HydrOffice BAG (hyo.bag)
+    HydrOffice BAG (hyo2.bag)
       Provided by: G.Masetti, B.R.Calder, and contributors
       Copyright and license information: additional_legal/hydroffice_bag_Copyrights_and_Licenses.txt
       Original source: https://bitbucket.org/ccomjhc/hyo_bag/raw/tip/COPYING.txt

diff --git a/hdf_compass/bag_model/__init__.py b/hdf_compass/bag_model/__init__.py
@@ -12,7 +12,7 @@
 # author: gmasetti@ccom.unh.edu                                              #
 ##############################################################################
 
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 
 from hdf_compass.bag_model.model import BAGStore, BAGDataset, BAGGroup, BAGImage, BAGKV
 

diff --git a/hdf_compass/bag_model/model.py b/hdf_compass/bag_model/model.py
@@ -19,9 +19,9 @@
 import posixpath as pp
 import h5py
 
-from hyo.bag import is_bag
-from hyo.bag import BAGFile
-from hyo.bag import BAGError
+from hyo2.bag import is_bag
+from hyo2.bag import BAGFile
+from hyo2.bag import BAGError
 
 from hdf_compass import compass_model
 from hdf_compass.utils import url2path

diff --git a/hdf_compass/compass_viewer/viewer.py b/hdf_compass/compass_viewer/viewer.py
@@ -189,6 +189,11 @@ def load_plugins():
     logger.debug("numpy %s" % numpy.__version__)
     logger.debug("matplotlib %s" % matplotlib.__version__)
     logger.debug("wxPython %s" % wx.__version__)
+    try:
+        import cartopy
+        logger.debug("cartopy %s" % cartopy.__version__)
+    except ImportError:
+        logger.debug("cartopy N/A")
 
     from hdf_compass import compass_model
 
@@ -212,9 +217,9 @@ def load_plugins():
 
     try:
         from hdf_compass import bag_model
-        from hyo import bag
+        from hyo2 import bag
         from lxml import etree
-        logger.debug("hyo.bag %s" % bag.__version__)
+        logger.debug("hyo2.bag %s" % bag.__version__)
         logger.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)))

diff --git a/hdf_compass/utils/__init__.py b/hdf_compass/utils/__init__.py
@@ -17,4 +17,4 @@
 from hdf_compass.utils.utils import is_darwin, is_win, is_linux, url2path, path2url, data_url
 
 
-__version__ = "0.7.b7"
+__version__ = "0.7.b8"
diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@ def txt_read(*paths):
 
 setup_args['name'] = 'hdf_compass'
 # The adopted versioning scheme follow PEP40
-setup_args['version'] = '0.7.b7'
+setup_args['version'] = '0.7.b8'
 setup_args['url'] = 'https://github.com/HDFGroup/hdf-compass/'
 setup_args['license'] = 'BSD-like license'
 setup_args['author'] = 'HDFGroup'
@@ -99,7 +99,7 @@ def txt_read(*paths):
 setup_args['extras_require'] =\
     {
         "GeoNodes": ["cartopy[plotting]", ],  # required for visualization of GeoArray and GeoSurface nodes
-        "BAG": ["hyo.bag", ],  # required by BAG plugin
+        "BAG": ["hyo2.bag", ],  # required by BAG plugin
         "OpenDAP": ["pydap>=3.2", ],  # required by OpenDAP plugin, there is an issue
                                       # with pydap 3.2: https://github.com/pydap/pydap/issues/66
         "ADIOS": ["adios>=1.9.1b19", ],  # required by ADIOS plugin