[hdf-compass] 282/295: more minor fixes

[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 7bffd8791357d446dd20b46690ad6f969f7c5e43
Author: giumas <giumas at yahoo.it>
Date:   Sun Apr 24 00:58:43 2016 -0400

    more minor fixes
---
 HDFCompass.1file.spec   |  2 ++
 HDFCompass.1folder.spec |  4 +++-
 README.rst              |  2 +-
 appveyor.yml            |  4 ++--
 setup.py                | 10 +---------
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/HDFCompass.1file.spec b/HDFCompass.1file.spec
index 1bd69a5..4677e02 100644
--- a/HDFCompass.1file.spec
+++ b/HDFCompass.1file.spec
@@ -50,6 +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('hydroffice.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
@@ -82,6 +83,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           pkg_data_hdf_compass,
+          pkg_data_bag,
           cartopy_aux,
           name=app_name,
           debug=True,
diff --git a/HDFCompass.1folder.spec b/HDFCompass.1folder.spec
index f889465..c64c770 100644
--- a/HDFCompass.1folder.spec
+++ b/HDFCompass.1folder.spec
@@ -50,6 +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('hydroffice.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
@@ -70,7 +71,7 @@ app_name = 'HDFCompass_' + version
 a = Analysis(['HDFCompass.py'],
              pathex=[],
              hiddenimports=['scipy.linalg.cython_blas', 'scipy.linalg.cython_lapack',
-             	'scipy.linalg', 'scipy.integrate'],  # for cartopy
+                            'scipy.linalg', 'scipy.integrate'],  # for cartopy
              excludes=["PySide"],  # exclude libraries from being bundled (in case that are installed)
              hookspath=None,
              runtime_hooks=None)
@@ -90,6 +91,7 @@ coll = COLLECT(exe,
                a.zipfiles,
                a.datas,
                pkg_data_hdf_compass,
+               pkg_data_bag,
                cartopy_aux,
                strip=None,
                upx=True,
diff --git a/README.rst b/README.rst
index 89f9bff..001feaa 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 HDF Compass
 ===========
 
-.. image:: https://badge.fury.io/py/hdf_compass.svg
+.. image:: https://badge.fury.io/py/v/hdf_compass.svg
     :target: https://badge.fury.io/py/hdf_compass
     :alt: PyPI Status
 
diff --git a/appveyor.yml b/appveyor.yml
index fc7fa44..bc60201 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,8 +31,8 @@ install:
   - "python --version"
 
   # Install dependencies
-  - "conda install -q h5py lxml numpy matplotlib pydap wxpython requests shapely proj4 geos"
-  - "pip install --no-dependencies hydroffice.bag cartopy[plotting] setuptools==19.2"
+  - "conda install -q h5py lxml numpy matplotlib pydap wxpython requests shapely proj4 geos cartopy"
+  - "pip install --no-dependencies hydroffice.bag setuptools==19.2"
   - "pip install pyinstaller"
 
   # Add to path the current folder
diff --git a/setup.py b/setup.py
index a832d04..4c10373 100644
--- a/setup.py
+++ b/setup.py
@@ -33,11 +33,6 @@ from setuptools import setup, find_packages
 #                             Some helper stuff
 # ---------------------------------------------------------------------------
 
-if 'bdist_wininst' in sys.argv:
-    if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
-        print("Error: bdist_wininst must be run alone. Exiting.")
-        sys.exit(1)
-
 here = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -67,10 +62,7 @@ setup_args['author_email'] = 'help at hdfgroup.org'
 
 description = 'An experimental viewer program for HDF5 and related formats.'
 setup_args['description'] = description
-if 'bdist_wininst' in sys.argv:
-    setup_args['long_description'] = description
-else:
-    setup_args['long_description'] = txt_read('README.rst')
+setup_args['long_description'] = txt_read('README.rst')
 
 setup_args['classifiers'] = \
     [  # https://pypi.python.org/pypi?%3Aaction=list_classifiers

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