Commit dfac3abc authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

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.
parent a3fb4787
Pipeline #3138 failed with stages
in 11 minutes and 39 seconds
...@@ -20,8 +20,8 @@ test_arosics: ...@@ -20,8 +20,8 @@ test_arosics:
stage: test stage: test
script: script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate arosics - source activate ci_env
- export GDAL_DATA=/root/miniconda3/envs/arosics/share/gdal - export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later - export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make nosetests - make nosetests
- make docs - make docs
...@@ -38,8 +38,8 @@ test_styles: ...@@ -38,8 +38,8 @@ test_styles:
stage: test stage: test
script: script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate arosics - source activate ci_env
- export GDAL_DATA=/root/miniconda3/envs/arosics/share/gdal - export GDAL_DATA=/root/miniconda3/envs/ci_env/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later - 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 # - pip install "pycodestyle>=2.0.0,!=2.4.0" # TODO remove as soon as docker runner is recreated
- make lint - make lint
...@@ -59,6 +59,7 @@ test_arosics_install: ...@@ -59,6 +59,7 @@ test_arosics_install:
- source activate arosics_testinstall - source activate arosics_testinstall
# resolve some requirements with conda # resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely geopandas
- conda install --yes -q -c conda-forge libgdal ncurses # Fix for libgdal installed from defaults channel causing libkea.so.1.4.7: cannot open shared object file: No such file or directory
# run installer # run installer
- python setup.py install - python setup.py install
# test if its importable # test if its importable
...@@ -109,7 +110,7 @@ deploy_pypi: ...@@ -109,7 +110,7 @@ deploy_pypi:
- test_arosics - test_arosics
script: # Configure the PyPI credentials, then push the package, and cleanup the creds. script: # Configure the PyPI credentials, then push the package, and cleanup the creds.
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate arosics - source activate ci_env
- mkdir -p public/images/ - mkdir -p public/images/
- cp -r docs/images/* public/images/ - cp -r docs/images/* public/images/
- printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc - printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
......
FROM gms_base_centos:latest FROM gms_base_centos:0.2
# copy some needed stuff to /root # copy some needed stuff to /root
COPY *.yml /root/ COPY *.yml /root/
# update the ci_env environment (that already contains all packages installed via 'docker_pyenvs' repo)
RUN /bin/bash -i -c "\ RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate ; \ source /root/miniconda3/bin/activate ; \
conda env update -f /root/environment_arosics.yml" source activate ci_env; \
conda env update -n ci_env -f /root/environment_arosics.yml"
Supports Markdown
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