Commit 7cca2a6b authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Added basemap setup and to docker builder ant to setup requirements.

updated __version__ and __versionalias__
parent 4b590247
Pipeline #384 passed with stages
in 48 seconds
......@@ -71,6 +71,8 @@ docs: ## generate Sphinx HTML documentation, including API docs
sphinx-apidoc -o docs/ geoarray
$(MAKE) -C docs clean
$(MAKE) -C docs html
# $(MAKE) -C docs latex
# $(MAKE) -C docs latexpdf
$(BROWSER) docs/_build/html/index.html
servedocs: docs ## compile the docs watching for changes
......
......@@ -2,8 +2,8 @@
__author__ = """Daniel Scheffler"""
__email__ = 'danschef@gfz-potsdam.de'
__version__ = '0.5.1'
__versionalias__ = 'v20170705.02'
__version__ = '0.5.2'
__versionalias__ = 'v20170707.01'
from .baseclasses import GeoArray
......
......@@ -10,3 +10,4 @@ mpld3
geojson
folium
holoviews
git+https://github.com/matplotlib/basemap.git
......@@ -11,13 +11,15 @@ with open('HISTORY.rst') as history_file:
requirements = [
'py_tools_ds', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'dill', 'mpld3', 'geojson', 'folium',
'holoviews']
'holoviews',
# git+https://github.com/matplotlib/basemap.git
]
test_requirements = ["coverage"]
setup(
name='geoarray',
version='0.5.1',
version='0.5.2',
description="Fast Python interface for geodata - either on disk or in memory.",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
......@@ -14,7 +14,7 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes -c ioam bokeh ; \
conda install --yes -c conda-forge gdal ; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools basemap; \
pip install shapely geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse folium geojson"
# copy some needed stuff to /root
......
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