Commit 8a1e4858 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

CI Python environment is now separate from base env. Added defaults channels...

CI Python environment is now separate from base env. Added defaults channels below conda-forge in environment.yml
parent 01dc6853
Pipeline #3117 failed with stage
in 1 minute and 56 seconds
......@@ -17,8 +17,8 @@ stages:
test_gms_preprocessing:
stage: test
script:
- source /root/miniconda3/bin/activate
- export GDAL_DATA=/root/miniconda3/share/gdal
- source /root/miniconda3/bin/activate gms_preprocessing
- export GDAL_DATA=/root/miniconda3/envs/gms_preprocessing/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- export GMS_db_host=${GMS_DB_HOST}
- export GMS_index_host=${GMS_INDEX_HOST}
......@@ -48,10 +48,10 @@ test_gms_preprocessing:
test_styles:
stage: test
script:
- source /root/miniconda3/bin/activate
- export GDAL_DATA=/root/miniconda3/share/gdal
- source /root/miniconda3/bin/activate gms_preprocessing
- export GDAL_DATA=/root/miniconda3/envs/gms_preprocessing/share/gdal
- 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
artifacts:
paths:
......
......@@ -3,6 +3,7 @@ name: gms_preprocessing
channels: &id1
- http://conda.anaconda.org/ioam # only for holoviews
- http://conda.anaconda.org/conda-forge
- defaults
dependencies:
- python=3.*.*
......
......@@ -5,12 +5,12 @@ COPY *.yml /root/
RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate ; \
conda env update -n root -f /root/environment_gms_preprocessing.yml"
conda env update -f /root/environment_gms_preprocessing.yml"
# copy sicor code to /tmp
COPY sicor /tmp/sicor
RUN bash -i -c "source /root/miniconda3/bin/activate; \
RUN bash -i -c "source /root/miniconda3/bin/activate gms_preprocessing; \
cd /tmp/sicor/ ; \
make clean ; \
make requirements ; \
......
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