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

Simplified optional dependency check. Updated minimal version of py_tools_ds. Updated version info.

parent aaa81d52
Pipeline #1312 canceled with stages
......@@ -12,8 +12,8 @@ from .masks import CloudMask # noqa: E402
__author__ = """Daniel Scheffler"""
__email__ = 'danschef@gfz-potsdam.de'
__version__ = '0.6.10'
__versionalias__ = 'v20171010.01'
__version__ = '0.6.11'
__versionalias__ = 'v20171010.02'
__all__ = ['GeoArray',
'BadDataMask',
'NoDataMask',
......
......@@ -3,6 +3,7 @@
from setuptools import setup, find_packages
import warnings
from importlib import util
with open('README.rst') as readme_file:
readme = readme_file.read()
......@@ -11,7 +12,7 @@ with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = [
'py_tools_ds>=0.6.0', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'pandas', 'dill', 'mpld3',
'py_tools_ds>=0.9.0', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'pandas', 'dill', 'mpld3',
'geojson', 'folium', 'scikit-image', 'dask>=0.15.0'
# dask is only indirectly needed but updating to >=0.15.0 resolves https://stackoverflow.com/questions/43833081/
# attributeerror-module-object-has-no-attribute-computation
......@@ -23,7 +24,7 @@ test_requirements = requirements + ["coverage", "nose", "nose2", "nose-htmloutpu
setup(
name='geoarray',
version='0.6.10',
version='0.6.11',
description="Fast Python interface for geodata - either on disk or in memory.",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......@@ -56,15 +57,11 @@ setup(
# check for holoviews
try:
import holoviews
except ImportError:
if not util.find_spec('holoviews'):
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
'plotting. It is not automatically installed.')
# check for basemap
try:
from mpl_toolkits.basemap import Basemap
except ImportError:
if not util.find_spec('mpl_toolkits.basemap'):
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
'It is not automatically installed.')
......@@ -2,7 +2,7 @@
context_dir="./context"
dockerfile="geoarray_ci.docker"
tag="geoarray_ci:0.6.0"
tag="geoarray_ci:0.6.10"
gitlab_runner="geoarray_gitlab_CI_runner"
echo "#### Build runner docker image"
......
......@@ -14,7 +14,8 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes -c conda-forge numpy gdal scikit-image matplotlib rasterio pyproj basemap shapely; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
pip install geopandas pandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse \
folium geojson py_tools_ds flake8 pycodestyle pylint pydocstyle nose nose2 nose-htmloutput coverage rednose"
folium geojson py_tools_ds>=0.9.0 flake8 pycodestyle pylint pydocstyle nose nose2 nose-htmloutput coverage \
rednose"
# copy some needed stuff to /root
#COPY *.pkl /root/ # EXAMPLE
......
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