Updated minimal version of py_tools_ds. Updated conda environment file.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

.gitlab-ci.yml

@@ -17,7 +17,7 @@ test_arosics:
     - source activate ci_env
     - export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
     - export PYTHONPATH=$PYTHONPATH:/root  # /root <- directory needed later
-    - pip install "py_tools_ds>=0.14.12"  # FIXME remove as soon as docker runner has been updated
+    - pip install "py_tools_ds>=0.14.25"  # FIXME remove as soon as docker runner has been updated
     - make nosetests
     # create the docs
     - pip install sphinx_rtd_theme  # Read-the-docs theme for SPHINX documentation
@@ -56,7 +56,7 @@ test_arosics_install:
     - conda create -y -q --name arosics_testinstall python=3
     - source activate arosics_testinstall
      # resolve some requirements with conda
-    - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas pandas
+    - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj shapely geopandas pandas
     - conda install --yes -q -c conda-forge libgdal ncurses # Fix for libgdal installed from defaults channel causing libkea.so.1.4.7: cannot open shared object file: No such file or directory
     # run installer
     - python setup.py install

docs/installation.rst

@@ -20,7 +20,7 @@ Using conda_, the recommended approach is:
 
    .. code-block:: bash
 
-    $ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas pandas cmocean
+    $ conda install -c conda-forge numpy gdal scikit-image matplotlib pyproj shapely geopandas pandas cmocean
 
 
 3. Install optional libraries for AROSICS (only needed for some specific functions):

requirements.txt

 geoarray>=0.8.17
-py_tools_ds>=0.14.12
+py_tools_ds>=0.14.25
 cmocean
 numpy
 gdal

setup.py

@@ -40,7 +40,7 @@ with open("arosics/version.py") as version_file:
     exec(version_file.read(), version)
 
 requirements = ['numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopandas', 'pandas', 'geoarray>=0.8.17',
-                'py_tools_ds>=0.14.12', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
+                'py_tools_ds>=0.14.25', 'plotly', 'cmocean', 'six', 'folium>=0.6.0', 'geojson'
                 # '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; \

tests/CI_docker/context/environment_arosics.yml

@@ -11,9 +11,7 @@ dependencies:
   - gdal
   - conda-forge::libgdal  # force to use conda-forge for libgdal to avoid package version incompatiblies due to mixed channels
   - scikit-image
-  - rasterio
   - pyproj
-  - lxml
   - geopandas
   - pandas
   - ipython
@@ -49,4 +47,4 @@ dependencies:
     - rednose
     - plotly
     - geoarray>=0.8.17
-    - py_tools_ds>=0.14.12
+    - py_tools_ds>=0.14.25