Revised CI jobs.

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

.gitlab-ci.yml

@@ -15,15 +15,6 @@ test_enpt_enmapboxapp:
     # install enpt_enmapboxapp, otherwise the executable scripts are not in place
     - pip install -e .
 
-    # update EnPT  # TODO revise as soon as EnPT is in PyPI
-    # - source /root/miniconda3/bin/activate enpt
-    # - rm -rf context/enpt
-    # - git clone git@git.gfz-potsdam.de:EnMAP/GFZ_Tools_EnMAP_BOX/EnPT.git ./context/enpt
-    # - cd ./context/enpt
-    # - pip install -e .
-    # - cd ../../
-    # - source /root/miniconda3/bin/activate ci_env
-
     # simulate DISPLAY for Qt
     - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log & DISPLAY=:1.0
     - export DISPLAY=:1.0
@@ -40,15 +31,14 @@ test_enpt_enmapboxapp:
     - make nosetests  # test are called here
 
     # create the docs
-#    - pip install sphinx_rtd_theme  # Read-the-docs theme for SPHINX documentation
-#    - make docs
-#  artifacts:
-#    paths:
-#    - htmlcov/
-#    - docs/_build/html/
-#    - nosetests.html
-#    - nosetests.xml
-#    - tests/linting
+    - make docs
+  artifacts:
+    paths:
+    - htmlcov/
+    - docs/_build/html/
+    - nosetests.html
+    - nosetests.xml
+    - tests/linting
   when: always
 
 
@@ -80,21 +70,20 @@ test_enpt_enmapboxapp_install:
   script:
     - source /root/miniconda3/bin/activate
 
-    # update conda and python
+    # update conda and python and install mamba
     - conda update -n base -c conda-forge conda
     # - conda update -c conda-forge python
+    - conda install -c conda-forge mamba
 
-    - conda create -y -q --name enpt_enmapboxapp_test python=3
-    - conda activate enpt_enmapboxapp_test
-
-    # install qgis
-    - conda install -c conda-forge qgis
+    # create an environment containing qgis, enpt and the EnMAP-Box requirements
+    - mamba env create -f tests/gitlab_CI_docker/context/environment_enpt_enmapboxapp.yml
+    - conda activate enpt_enmapboxapp
 
     # install enmapbox
     - cd ..
     - rm -rf enmap-box
-    - git clone https://bitbucket.org/hu-geomatics/enmap-box.git
-    - pip install -r https://bitbucket.org/hu-geomatics/enmap-box/raw/develop/requirements.txt ; \
+    - git clone -b master https://bitbucket.org/hu-geomatics/enmap-box.git
+    - pip install -r https://bitbucket.org/hu-geomatics/enmap-box/raw/master/requirements.txt ; \  # should all be there
     - cd enmap-box
     - pip install .
     - cd ../enpt_enmapboxapp
@@ -107,25 +96,20 @@ test_enpt_enmapboxapp_install:
     # echo installed packages
     - conda list qgis
     - conda list enmapbox
+    - conda list enpt
 
     # test importability
-    - cd ../enmap-box  # we need to jump into that folder, otherwise enmapbox is not importable (due to an issue with its setup.py)
     - python -c "import enpt_enmapboxapp; print(enpt_enmapboxapp)"
     - python -c "from enpt_enmapboxapp import EnPTAlgorithm, EnMAPBoxApplication"
   only:
     - master
-    - dev
 
 
 pages:
   stage: deploy
-#  dependencies:
-#    - test_enpt_enmapboxapp
+  dependencies:
+    - test_enpt_enmapboxapp
   script:
-    # create the docs
-    - pip install sphinx_rtd_theme  # Read-the-docs theme for SPHINX documentation
-    - make docs
-
     # Create the public directory
     - rm -rf public
     - mkdir public
@@ -157,8 +141,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