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

Removed additional env 'py3'.

parent 823cf0bc
Pipeline #1558 failed with stages
in 52 seconds
......@@ -18,8 +18,7 @@ test_py_tools_ds:
stage: test
script:
- source /root/miniconda3/bin/activate
- source activate py3
- export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
- export GDAL_DATA=/root/miniconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make nosetests
- make docs
......@@ -36,8 +35,7 @@ test_styles:
stage: test
script:
- source /root/miniconda3/bin/activate
- source activate py3
- export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
- export GDAL_DATA=/root/miniconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make lint
artifacts:
......@@ -52,8 +50,7 @@ test_py_tools_ds_install:
stage: test
script:
- source /root/miniconda3/bin/activate
- source activate py3
- export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
- export GDAL_DATA=/root/miniconda3/share/gdal
- conda create -y -q --name py_tools_ds python=3
- source activate py_tools_ds
# resolve some requirements with conda
......
FROM centos:7
# matplotlib requires freetype, freetype-devel, libpng-devel under centos
# scikit-image requires blas-devel, lapack-devel, atlas-devel under centos
RUN yum update -y && \
yum install -y wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git nano tree gdb
ENV miniconda_dl 'Miniconda3-latest-Linux-x86_64.sh'
ENV envconfig 'environment_pinned_v0.1.yml'
ENV envname 'py3'
ENV git_lfs_v='2.1.1'
RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/miniconda/$miniconda_dl ; \
......@@ -16,7 +17,7 @@ COPY *.yml /root/
# create an environment with all packages specified in $envconfig
RUN /bin/bash -i -c "source /root/miniconda3/bin/activate ; \
conda env create -n $envname -f /root/$envconfig"
conda env update -f /root/$envconfig"
# install git lfs
RUN /bin/bash -i -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash"
......
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