From 84374f2598aa608d7f04d35b95493385ab5f4d1f Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Thu, 29 Sep 2016 15:38:47 +0200
Subject: [PATCH] Reverted to the old ci
---
.gitlab-ci.yml | 3 ++-
requirements.txt | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0604118..27064ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ variables:
- git clean -ffdx
- curl --silent https://gitlab.idiap.ch/bob/bob/snippets/7/raw | tr -d '\r' > bootstrap-conda.sh
- chmod 755 ./bootstrap-conda.sh
+ - sed 1d requirements.txt > requirements.txt # GAMBIT to remove pillow<3
- ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
variables: &build_variables
BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
@@ -83,7 +84,7 @@ variables:
before_script:
- ./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
+ - conda install --yes -c conda-forge -p ${CONDA_PREFIX} opencv==2.4.12 pillow==2.9.0
- pip install --use-wheel --no-index --pre dist/*.whl
script:
- cd ${CONDA_PREFIX}
diff --git a/requirements.txt b/requirements.txt
index 15c1626..ded28fb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+pillow<3
setuptools
bob.extension
bob.blitz
--
GitLab