Commit 14221f75 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fix for holoviews setup issue within docker builder.

updated __version__ and __versionalias__
parent 74cdac67
Pipeline #390 canceled with stages
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
__author__ = """Daniel Scheffler""" __author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de' __email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.4.4' __version__ = '0.4.5'
__versionalias__ = '2017-07-07_07' __versionalias__ = '2017-07-07_05'
from .CoReg import COREG from .CoReg import COREG
......
...@@ -24,7 +24,7 @@ test_requirements = ['coverage'] ...@@ -24,7 +24,7 @@ test_requirements = ['coverage']
setup( setup(
name='arosics', name='arosics',
version='0.4.4', version='0.4.5',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data", description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history, long_description=readme + '\n\n' + history,
author="Daniel Scheffler", author="Daniel Scheffler",
......
...@@ -8,10 +8,13 @@ RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_ ...@@ -8,10 +8,13 @@ RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_
rm -f /root/$anaconda_dl" rm -f /root/$anaconda_dl"
# 'conda install --yes -c conda-forge 'icu=58.*' lxml' fixing a bug for conda-forge gdal build, as of 06/2017 # 'conda install --yes -c conda-forge 'icu=58.*' lxml' fixing a bug for conda-forge gdal build, as of 06/2017
# holoviews and bokeh is only needed for geoarray because its not installable via pip during geoarray.setup.py
RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes pyqt coverage ; \ conda install --yes pyqt coverage ; \
conda install --yes -c conda-forge gdal ; \ conda install --yes -c conda-forge gdal ; \
conda install --yes -c conda-forge pyfftw=0.10.4 ; \ conda install --yes -c conda-forge pyfftw=0.10.4 ; \
conda install --yes -c ioam holoviews=1.8.0 ; \
conda install --yes -c ioam bokeh ; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \ conda install --yes -c conda-forge 'icu=58.*' lxml ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools basemap; \ 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 spectral \ pip install shapely geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse spectral \
......
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