Commit 6f89e416 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Revised CI jobs.


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