From dbc6bb1eeed74ad7674c36bbcf4f39df42a0fb8b Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Wed, 8 Feb 2017 14:27:57 +0100
Subject: [PATCH] Update to anaconda 4.3.0, remove virtualenv

---
 install/from-scratch.sh | 46 +++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 5239777..0b77689 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -36,61 +36,67 @@ 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=4.3.0 \
   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 \
   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 \
   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 \
   vlfeat=0.9.20
 
 echo "[>>] Bye!"
-- 
GitLab