diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffd287780afa6f344e81f48dc779bf3737194d49..46275a747acb600c6b39720a24b5e8dff99d42e7 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 6cb3a9efe8e36c60bc67165175f94d9cd1664336..15c1626459bad34b5a82d30b85dadaa2c0fe046f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ setuptools -pillow<3 bob.extension bob.blitz bob.core