Commit fe33d7b6 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated setup.py and added scikit-image to setup requirements.

updated __version__ and __versionalias__
parent 7cca2a6b
Pipeline #393 passed with stages
in 56 seconds
......@@ -2,8 +2,8 @@
__author__ = """Daniel Scheffler"""
__email__ = 'danschef@gfz-potsdam.de'
__version__ = '0.5.2'
__versionalias__ = 'v20170707.01'
__version__ = '0.5.3'
__versionalias__ = 'v20170707.02'
from .baseclasses import GeoArray
......
......@@ -9,5 +9,6 @@ dill
mpld3
geojson
folium
holoviews
scikit-image
#holoviews
git+https://github.com/matplotlib/basemap.git
......@@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
from setuptools import setup, find_packages
import warnings
with open('README.rst') as readme_file:
readme = readme_file.read()
......@@ -11,7 +12,8 @@ with open('HISTORY.rst') as history_file:
requirements = [
'py_tools_ds', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'dill', 'mpld3', 'geojson', 'folium',
'holoviews',
'scikit-image'
#'holoviews', # conda install --yes -c ioam bokeh holoviews=1.8.0 ; \
# git+https://github.com/matplotlib/basemap.git
]
......@@ -19,7 +21,7 @@ test_requirements = ["coverage"]
setup(
name='geoarray',
version='0.5.2',
version='0.5.3',
description="Fast Python interface for geodata - either on disk or in memory.",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......@@ -48,3 +50,18 @@ setup(
test_suite='tests',
tests_require=test_requirements
)
# check for holoviews
try:
import holoviews
except ImportError:
warnings.warn('You need to install holoviews manually (see www.holoviews.org) if you want to use interactive '
'plotting. It is not automatically installed.') # TODO
# check for basemap
try:
from mpl_toolkits.basemap import Basemap
except ImportError:
warnings.warn('You need to install basemap manually (see www./matplotlib.org/basemap) if you want to plot maps. '
'It is not automatically installed.') # TODO
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment