Commit f0efa57d authored by Niklas Bohn's avatar Niklas Bohn
Browse files

Merge branch 'enhancement/update_CI_jobs' into 'master'

Enhancement/update ci jobs

See merge request !76
parents d474194e 43a8f0d3
...@@ -13,9 +13,9 @@ test_sicor_install: ...@@ -13,9 +13,9 @@ test_sicor_install:
script: script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
# run sicor installation in a fresh environment # run sicor installation in a fresh environment
- conda create -y -q -c conda-forge --name sicor_testinstall sicor - mamba create -y -q -c conda-forge --name sicor_testinstall sicor
- source activate sicor_testinstall - conda activate sicor_testinstall
- conda install -c conda-forge arosics=1.2.6 # temporarily needed in case noarch package of arosics is installed (currently not the latest release => causes ModuleNotFoundError for py_tools_ds version 0.16.7) - mamba install -c conda-forge arosics=1.2.6 # temporarily needed in case noarch package of arosics is installed (currently not the latest release => causes ModuleNotFoundError for py_tools_ds version 0.16.7)
# test if its importable # test if its importable
- cd .. - cd ..
- pwd - pwd
...@@ -29,17 +29,16 @@ test_sicor_enmap: ...@@ -29,17 +29,16 @@ test_sicor_enmap:
stage: test stage: test
script: script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate sicor_env - conda activate sicor_env
- export GDAL_DATA=/root/miniconda3/envs/sicor_env/share/gdal - export GDAL_DATA=/root/miniconda3/envs/sicor_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later - export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- pip install pycodestyle --upgrade - pip install pycodestyle --upgrade
- conda install -c conda-forge gdown - mamba install -c conda-forge gdown
- pip install openpyxl
# copy testdata # copy testdata
- cd /root/EnPT/enpt - cd /root/EnPT/enpt
- git pull - git pull
- cp -r /root/EnPT/enpt /root/miniconda3/envs/sicor_env/lib/python3.8/site-packages/enpt-0.16.3-py3.8.egg/ - cp -r /root/EnPT/enpt /root/miniconda3/envs/sicor_env/lib/python3.8/site-packages/enpt-0.17.2-py3.8.egg/
- cp -r /root/EnPT/tests /root/miniconda3/envs/sicor_env/lib/python3.8/site-packages/enpt-0.16.3-py3.8.egg/ - cp -r /root/EnPT/tests /root/miniconda3/envs/sicor_env/lib/python3.8/site-packages/enpt-0.17.2-py3.8.egg/
- cd /builds/EnMAP/sicor - cd /builds/EnMAP/sicor
- make lint - make lint
- make nosetests_enmap # enmap tests are called here - make nosetests_enmap # enmap tests are called here
...@@ -68,11 +67,11 @@ test_sicor_s2: ...@@ -68,11 +67,11 @@ test_sicor_s2:
- tests/test_sicor_s2.py - tests/test_sicor_s2.py
script: script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate sicor_env - conda activate sicor_env
- export GDAL_DATA=/root/miniconda3/envs/sicor_env/share/gdal - export GDAL_DATA=/root/miniconda3/envs/sicor_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later - export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- pip install pycodestyle --upgrade - pip install pycodestyle --upgrade
- conda install -c conda-forge pygrib cachetools gdown - mamba install -c conda-forge pygrib cachetools gdown scikit-learn<=0.21.3
- make lint - make lint
- make nosetests_s2 # sentinel-2 tests are called here - make nosetests_s2 # sentinel-2 tests are called here
- pip install sphinx_rtd_theme # Read-the-docs theme for SPHINX documentation - pip install sphinx_rtd_theme # Read-the-docs theme for SPHINX documentation
...@@ -133,7 +132,7 @@ deploy_pypi: ...@@ -133,7 +132,7 @@ deploy_pypi:
- test_sicor_enmap - test_sicor_enmap
script: script:
- source /root/miniconda3/bin/activate sicor_env - source /root/miniconda3/bin/activate sicor_env
- conda install -c conda-forge pygrib - mamba install -c conda-forge pygrib
- pip install -U twine - pip install -U twine
- python setup.py sdist - python setup.py sdist
- twine upload dist/* - twine upload dist/*
......
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