Commit 68e72e8b authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated Anaconda version within docker setup. Updated runner version. Revised .gitlab-ci.yml.

parent 0c77bf00
Pipeline #1326 failed with stages
in 13 minutes and 51 seconds
......@@ -37,7 +37,6 @@ test_styles:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- pip install flake8 pycodestyle pylint pydocstyle # TODO remove as soon as docker container is rebuilt
- make lint
artifacts:
paths:
......@@ -52,16 +51,20 @@ test_py_tools_ds_install:
script:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- conda create -y -q --name py_tools_ds python=3.5
- conda create -y -q --name py_tools_ds python=3
- source activate py_tools_ds
# resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image pyproj rasterio shapely
# run installer
- python setup.py install
# test if its importable
- cd ..
- pwd
- ls
- python -c "import py_tools_ds; print(py_tools_ds)"
- python -c "from py_tools_ds.geo.vector.geometry import boxObj"
only:
- master
deploy_pages:
......@@ -96,9 +99,8 @@ deploy_pypi:
- python setup.py check sdist upload -r pypi # This will fail if your creds are bad.
- echo "" > ~/.pypirc && rm ~/.pypirc # If the above fails, this won't run.
only:
- master
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- dev
cleanup_pypirc:
......
......@@ -2,7 +2,7 @@
context_dir="./context"
dockerfile="py_tools_ds_ci.docker"
tag="py_tools_ds_ci:0.7.0"
tag="py_tools_ds_ci:0.9.0"
gitlab_runner="py_tools_ds_gitlab_CI_runner"
echo "#### Build runner docker image"
......
......@@ -2,7 +2,7 @@ FROM centos:7
RUN yum update -y && \
yum install -y wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git
ENV anaconda_dl 'Anaconda3-4.3.1-Linux-x86_64.sh'
ENV anaconda_dl 'Anaconda3-5.0.0-Linux-x86_64.sh'
RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_dl ; \
bash -i /root/$anaconda_dl -b ; \
rm -f /root/$anaconda_dl"
......
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