From 32415c5b91694cc8cf48fb124dbe4f09e86814f8 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira <tiagofrepereira@gmail.com> Date: Thu, 29 Sep 2016 15:11:42 +0200 Subject: [PATCH] Reverted to the old ci --- .gitlab-ci.yml | 3 ++- requirements.txt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffd2877..46275a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,8 @@ variables: - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX} - source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX} - conda install --yes -c conda-forge -p ${CONDA_PREFIX} opencv==2.4.12 - - pip install --use-wheel --pre dist/*.whl + - pip install --use-wheel --no-index --pre dist/*.whl + - pip install pillow<3 script: - cd ${CONDA_PREFIX} - export PYTHONPATH="../PythonFaceEvaluation/src:$PYTHONPATH" diff --git a/requirements.txt b/requirements.txt index 6cb3a9e..15c1626 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ setuptools -pillow<3 bob.extension bob.blitz bob.core -- GitLab