Updated CI runner setup files.

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

.gitlab-ci.yml

@@ -157,8 +157,8 @@ pages:
 
 deploy_pypi:
   stage: deploy
-  dependencies:
-    - test_enpt_enmapboxapp
+#  dependencies:
+#    - test_enpt_enmapboxapp
   script:
     - source /root/miniconda3/bin/activate ci_env
     - pip install -U twine

tests/gitlab_CI_docker/before_script.sh

@@ -4,11 +4,3 @@
 rm -rf context/enmapbox
 git clone https://bitbucket.org/hu-geomatics/enmap-box.git ./context/enmapbox
 # git clone https://bitbucket.org/hu-geomatics/enmap-box.git --branch develop --single-branch ./context/enmapbox
-
-# get EnPT project
-rm -rf context/enpt
-git clone git@git.gfz-potsdam.de:EnMAP/GFZ_Tools_EnMAP_BOX/EnPT.git ./context/enpt
-
-# get SICOR project
-rm -rf context/sicor
-git clone git@git.gfz-potsdam.de:EnMAP/sicor.git ./context/sicor

tests/gitlab_CI_docker/context/enpt_enmapboxapp_ci.docker

@@ -19,13 +19,12 @@ COPY *.yml /root/
 RUN /bin/bash -i -c "\
     source /root/miniconda3/bin/activate ; \
     conda update -n base -c conda-forge conda;\
+    conda install -c conda-forge mamba ; \
     conda activate ci_env; \
-    conda env update -n ci_env -f /root/environment_enpt_enmapboxapp.yml"
+    mamba env update -n ci_env -f /root/environment_enpt_enmapboxapp.yml"
 
-# copy enmapbox, enpt and sicor code to /tmp
+# copy enmapbox code to /tmp
 COPY enmapbox /tmp/enmapbox
-COPY enpt /tmp/enpt
-COPY sicor /tmp/sicor
 
 # install enmapbox (in pip development mode)
 RUN bash -i -c "\
@@ -35,13 +34,9 @@ RUN bash -i -c "\
     pip install -e . ; \
     conda list"
 
-# install enpt (into separate conda environment; in pip development mode)
+# install enpt (into separate conda environment)
 RUN bash -i -c "\
     source /root/miniconda3/bin/activate ; \
-    conda env update -f /tmp/enpt/tests/gitlab_CI_docker/context/environment_enpt.yml ; \
+    mamba create -n enpt -c conda-forge enpt ; \
     conda activate enpt ; \
-    cd /tmp/sicor/ ; \
-    pip install -e . ; \
-    cd /tmp/enpt/ ; \
-    pip install -e . ; \
     conda list"

tests/gitlab_CI_docker/context/environment_enpt_enmapboxapp.yml

@@ -6,11 +6,25 @@ channels: &id1
 dependencies:
   - python=3.*.*
   - pip  # avoids that conda uses the wrong pip
-  - qgis
+  - enpt
+  - qgis>=3.16
+
+  # EnMAP-Box
+  - matplotlib
+  - netcdf4
+  - numba
+  - numpy
+  - pyopengl
+  - qgis>=3.16
+  - scikit-learn
 
   - pip:
     - psutil
-    # - enmapbox  # not installable via PyPi
+
+    # EnMAP-Box
+    # - enmapbox  # not installable via PyPI
+    - astropy
+    - scipy
 
     # docs
     - sphinx-argparse