Merge branch 'staging' into 'master'

Update to anaconda 4.3.0, remove virtualenv

See merge request !44

gitlab/functions.sh

@@ -283,3 +283,9 @@ if [ -z "${CI_BUILD_TAG}" ]; then
 else
   log_info "Building tag, not setting BOB_DOCUMENTATION_SERVER"
 fi
+
+# sets up certificates for curl and openssl
+CURL_CA_BUNDLE="$(dirname ${0})/cacert.pem"
+export_env CURL_CA_BUNDLE
+SSL_CERT_FILE="${CURL_CA_BUNDLE}"
+export_env SSL_CERT_FILE

gitlab/install.sh

@@ -57,6 +57,7 @@ get_exec() {
 
 
 run_cmd mkdir -pv ${1}
+get_script ${1} cacert.pem
 get_script ${1} functions.sh
 get_exec ${1} install.sh
 for stage in "build" "test" "docs" "wheels" "deploy"; do

install/from-scratch.sh

@@ -30,67 +30,80 @@ fi
 
 if [ "$(uname)" == "Linux" ]; then
     TENSORFLOW=tensorflow
+    MYGCCPACKAGE="gcc=4.8.5"
+    MYLIBGCCPKG="libgcc=4.8.5"
+    ANACONDA="anaconda=4.2.0"
 else
     TENSORFLOW=
+    MYGCCPACKAGE=
+    MYLIBGCCPKG=
+    ANACONDA="anaconda=4.3.0"
 fi
 
 # For a complete list of dependencies, please read:
 # https://gitlab.idiap.ch/bob/bob/wikis/Dependencies
+
+# the dependencies that come before anaconda are being pulled and pinned using
+# anaconda. When you update to a new version of anaconda make sure the
+# dependencies are still in the newer version of anaconda. If they are not
+# there anymore, you need to pin them if we still need them. Otherwise, remove
+# them from here too.
+
 echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
 ${CONDA} create --copy --yes -n ${NAME} \
   --override-channels \
   -c http://www.idiap.ch/software/bob/conda \
   -c defaults \
   python=$PYTHON_VERSION \
-  anaconda=4.2.0 \
+  cython \
+  dask \
+  hdf5 \
+  jpeg \
+  libpng \
+  libtiff \
+  matplotlib \
+  nose \
+  numexpr \
+  numpy \
+  pillow \
+  pip \
+  psutil \
+  scikit-image \
+  scikit-learn \
+  scipy \
+  sphinx \
+  sqlalchemy \
+  ${ANACONDA} \
   boost=1.61 \
   ${CAFFE} \
   cmake \
   coverage \
-  cython=0.24.1 \
   cyvlfeat=0.4.5 \
-  dask=0.11.0 \
   docopt \
   ffmpeg=2.8.10 \
-  gcc=4.8.5 \
-  libgcc=4.8.5 \
+  ${MYGCCPACKAGE} \
+  ${MYLIBGCCPKG} \
   giflib=5.1.4 \
-  hdf5=1.8.17 \
   ipdb=0.10.2 \
   ipython \
-  jpeg=8d \
   libblitz=0.10 \
   libmatio=1.5 \
-  libpng=1.6.22 \
   libsvm=3.21 \
-  libtiff=4.0.6 \
-  matplotlib=1.5.3 \
   menpo=0.7.7 \
   menpofit=0.4.1 \
   menpowidgets=0.2.1p3 \
   mne=0.13.1 \
-  nose=1.3.7 \
-  numexpr=2.6.1 \
-  numpy=1.11.1 \
+  olefile=0.44 \
   openblas=0.2.19 \
   opencv=3 \
-  pillow=3.3.1 \
-  pip=8.1.2 \
   pkgtools=0.7.3 \
   pkg-config \
-  psutil=4.3.1 \
   pyedflib=0.1.6 \
   schema=0.6.5 \
-  scikit-image=0.12.3 \
-  scikit-learn=0.17.1 \
-  scipy=0.18.1 \
   sox=14.4.2 \
-  sphinx=1.4.6 \
   sphinx_rtd_theme \
-  sqlalchemy=1.0.13 \
   ${TENSORFLOW} \
-  toolchain=2.1.0 \
-  virtualenv \
+  toolchain=2.3.0 \
   vlfeat=0.9.20
 
 echo "[>>] Bye!"