From 42651229923fe4871eb28aed8a7e8c1edf398178 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira <tiagofrepereira@gmail.com> Date: Thu, 29 Sep 2016 16:06:37 +0200 Subject: [PATCH] Reverted to the old ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32e6657..1691bbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ variables: - sed 1d -i requirements.txt # GAMBIT to remove pillow<3 - ./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 pillow==2.9.0 jpeg=8d + - conda install --yes -c conda-forge -p ${CONDA_PREFIX} jpeg opencv==2.4.12 pillow==2.9.0 - pip install --use-wheel --no-index --pre dist/*.whl script: - cd ${CONDA_PREFIX} -- GitLab