From f4ff26e1c016e856293f0655b01b5f91fd6876b3 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 19 Sep 2016 11:27:19 +0200
Subject: [PATCH] Add scikit-image

---
 from-scratch.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 from-scratch.sh

diff --git a/from-scratch.sh b/from-scratch.sh
old mode 100755
new mode 100644
index 04cb702..9d4bae7
--- a/from-scratch.sh
+++ b/from-scratch.sh
@@ -50,7 +50,8 @@ if [[ "$PYTHON_VERSION" == "2.7" ]]; then
     psutil=4.3.0=py27_0 \
     scikit-learn=0.17.1 \
     scipy=0.17.1 \
-    sqlalchemy=1.0.13=py27_0
+    sqlalchemy=1.0.13=py27_0 \
+    scikit-image=0.12.3=np111py27_1
 fi
 if [[ "$PYTHON_VERSION" == "3.4" ]]; then
   ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \
@@ -72,7 +73,8 @@ if [[ "$PYTHON_VERSION" == "3.4" ]]; then
     psutil=4.3.0=py34_0 \
     scikit-learn=0.17.1 \
     scipy=0.17.1 \
-    sqlalchemy=1.0.13=py34_0
+    sqlalchemy=1.0.13=py34_0 \
+    scikit-image=0.12.3=np111py34_1
 fi
 if [[ "$PYTHON_VERSION" == "3.5" ]]; then
   ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \
@@ -94,7 +96,8 @@ if [[ "$PYTHON_VERSION" == "3.5" ]]; then
     psutil=4.3.0=py35_0 \
     scikit-learn=0.17.1 \
     scipy=0.17.1 \
-    sqlalchemy=1.0.13=py35_0
+    sqlalchemy=1.0.13=py35_0 \
+    scikit-image=0.12.3=np111py35_1
 fi
 
 ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \
-- 
GitLab