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

Updated README. Moved geopandas to conda dependencies.

parent 3bbf3298
Pipeline #1515 passed with stages
in 8 minutes and 23 seconds
......@@ -30,6 +30,10 @@ Status
:target: http://danschef.gitext.gfz-potsdam.de/geoarray/coverage/
.. image:: https://img.shields.io/pypi/v/geoarray.svg
:target: https://pypi.python.org/pypi/geoarray
.. image:: https://img.shields.io/pypi/l/geoarray.svg
:target: https://gitext.gfz-potsdam.de/danschef/geoarray/blob/master/LICENSE
.. image:: https://img.shields.io/pypi/pyversions/geoarray.svg
:target:
See also the latest coverage_ report and the nosetests_ HTML report.
......@@ -53,7 +57,7 @@ Using conda_, the recommended approach is:
# create virtual environment for geoarray, this is optional
conda create -y -q --name geoarray python=3
source activate geoarray
conda install -y -q -c conda-forge numpy gdal scikit-image matplotlib pandas rasterio pyproj basemap shapely
conda install -y -q -c conda-forge numpy gdal scikit-image matplotlib pandas rasterio pyproj basemap shapely geopandas
conda install --yes -c ioam bokeh holoviews # optional
......
......@@ -11,9 +11,9 @@ RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_
RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes pyqt ; \
conda install --yes -c ioam holoviews bokeh ; \
conda install --yes -c conda-forge numpy gdal scikit-image matplotlib rasterio pyproj basemap shapely; \
conda install --yes -c conda-forge numpy gdal scikit-image matplotlib rasterio pyproj basemap shapely geopandas; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
pip install geopandas pandas dill dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse \
pip install pandas dill dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse \
folium geojson py_tools_ds>=0.9.0 flake8 pycodestyle pylint pydocstyle nose nose2 nose-htmloutput coverage \
rednose"
......
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