Skip to content

Commit

Permalink
Merge pull request #161 from giumas/develop
Browse files Browse the repository at this point in the history
Setup.py modifications for making optional some dependencies
  • Loading branch information
giumas committed Apr 28, 2016
2 parents b1dda4d + 30a877c commit 2d389d5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ __pycache__/
# build files
/build
/dist
/*.eggs
/*.egg
/*.egg-info/
/*.egg-link
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# The short X.Y version.
version = '0.6'
# The full version, including alpha/beta/rc tags.
release = '0.6.0b3'
release = '0.6.0b4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion hdf_compass/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
from .utils import is_darwin, is_win, is_linux, url2path, path2url, data_url


__version__ = "0.6.0b3"
__version__ = "0.6.0b4"
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.6.0b3
current_version = 0.6.0b4
files = setup.py hdf_compass/utils/__init__.py docs/conf.py HDFCompass.1file.spec

[bdist_wheel]
Expand Down
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def txt_read(*paths):

setup_args['name'] = 'hdf_compass'
# The adopted versioning scheme follow PEP40
setup_args['version'] = '0.6.0b3'
setup_args['version'] = '0.6.0b4'
setup_args['url'] = 'https://github.com/HDFGroup/hdf-compass/'
setup_args['license'] = 'BSD-like license'
setup_args['author'] = 'HDFGroup'
Expand Down Expand Up @@ -96,13 +96,16 @@ def txt_read(*paths):
[
"numpy",
"matplotlib>=1.5",
"cartopy[plotting]",
"h5py",
"wxPython==3.0.2",
"hydroffice.bag>=0.2.10",
"pydap",
"requests"
]
setup_args['extras_require'] =\
{
"GeoNodes": ["cartopy[plotting]", ], # required for visualization of GeoArray and GeoSurface nodes
"BAG": ["hydroffice.bag>=0.2.10", ], # required by BAG plugin
"OpenDAP": ["pydap", ], # required by OpenDAP plugin
}
# hdf_compass namespace, packages and other files
setup_args['namespace_packages'] = ['hdf_compass']
setup_args['packages'] = find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests", "*.test*",
Expand Down

0 comments on commit 2d389d5

Please sign in to comment.