CI setup now updates ci_env environment installed via docker_pyenvs instead of...

CI setup now updates ci_env environment installed via docker_pyenvs instead of creating an independent environment.

.gitlab-ci.yml

@@ -18,12 +18,10 @@ test_geoarray:
   stage: test
   script:
     - source /root/miniconda3/bin/activate
-    - source activate geoarray
-    - export GDAL_DATA=/root/miniconda3/envs/geoarray/share/gdal
+    - source activate ci_env
+    - export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
     - export PYTHONPATH=$PYTHONPATH:/root  # /root <- directory needed later
     - export LD_LIBRARY_PATH=/root/anaconda3/lib:$LD_LIBRARY_PATH # /root <- directory needed later
-    # update in-house dependencies
-    - pip install py_tools_ds>=0.9.0
     # run tests
     - make nosetests
     - make docs
@@ -40,8 +38,8 @@ test_styles:
   stage: test
   script:
     - source /root/miniconda3/bin/activate
-    - source activate geoarray
-    - export GDAL_DATA=/root/miniconda3/envs/geoarray/share/gdal
+    - source activate ci_env
+    - export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
     - export PYTHONPATH=$PYTHONPATH:/root  # /root <- directory needed later
 #    - pip install "pycodestyle>=2.0.0,!=2.4.0"  # TODO remove as soon as docker runner is recreated
     - make lint

tests/CI_docker/context/geoarray_ci.docker

@@ -3,6 +3,8 @@ FROM gms_base_centos:latest
 # copy some needed stuff to /root
 COPY *.yml /root/
 
+# update the ci_env environment (that already contains all packages installed via 'docker_pyenvs' repo)
 RUN /bin/bash -i -c "\
     source /root/miniconda3/bin/activate ; \
-    conda env update -f /root/environment_geoarray.yml"
+    source activate ci_env; \
+    conda env update -n ci_env -f /root/environment_geoarray.yml"