Commit 81a7761f authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated version info. Updated minimal version py_tools_ds. Added geopandas to CI installer test.

parent 3c234cd5
Pipeline #1540 failed with stages
in 52 seconds
......@@ -56,7 +56,7 @@ test_arosics_install:
- conda create -y -q --name arosics python=3
- source activate arosics
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas
# run installer
- python setup.py install
# test if its importable
......
......@@ -12,8 +12,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid
__author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.6.8'
__versionalias__ = '2017-11-16_01'
__version__ = '0.6.9'
__versionalias__ = '2017-11-16_02'
__all__ = ['COREG',
'COREG_LOCAL',
'DESHIFTER',
......
......@@ -14,7 +14,7 @@ with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = ['numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopandas', 'geoarray>=0.6.16',
'py_tools_ds>=0.12.0', 'plotly', 'cmocean', 'six',
'py_tools_ds>=0.12.1', 'plotly', 'cmocean', 'six',
# 'pykrige' # conda install --yes -c conda-forge pykrige
# 'pyfftw', # conda install --yes -c conda-forge pyfftw=0.10.4 ; \
# 'basemap', # conda install --yes -c conda-forge basemap; \
......@@ -28,7 +28,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn
setup(
name='arosics',
version='0.6.8',
version='0.6.9',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
......@@ -2,7 +2,7 @@
context_dir="./context"
dockerfile="arosics_ci.docker"
tag="arosics_ci:0.5.1"
tag="arosics_ci:0.6.9"
gitlab_runner="arosics_gitlab_CI_runner"
echo "#### Build runner docker image"
......
......@@ -19,7 +19,7 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely basemap pykrige geopandas; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
pip install dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse \
geoarray>=0.6.12 py_tools_ds>=0.12.0 plotly flake8 pycodestyle pylint pydocstyle coverage nose nose2 \
geoarray>=0.6.12 py_tools_ds>=0.12.1 plotly flake8 pycodestyle pylint pydocstyle coverage nose nose2 \
nose-htmloutput rednose" # must include all the requirements needed to build the docs!
# 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