Merge branch 'add-scikit-image' into 'master'

Add scikit-image

Closes #9 
Also the list files need to be updated too.

ping @onikisins @teglitis 

See merge request !1

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 \

linux/devel-py27.txt

@@ -40,6 +40,7 @@ https://repo.continuum.io/pkgs/free/linux-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/libxml2-2.9.2-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/markupsafe-0.23-py27_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/matplotlib-1.5.1-np111py27_0.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/networkx-1.11-py27_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nose-1.3.7-py27_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/numexpr-2.6.0-np111py27_nomkl_0.tar.bz2
@@ -66,6 +67,7 @@ https://repo.continuum.io/pkgs/free/linux-64/python-dateutil-2.5.3-py27_0.tar.bz
 https://repo.continuum.io/pkgs/free/linux-64/pytz-2016.6.1-py27_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/scikit-image-0.12.3-np111py27_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scikit-learn-0.17.1-np111py27_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scipy-0.17.1-np111py27_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/setuptools-26.1.1-py27_0.tar.bz2

linux/devel-py34.txt

@@ -40,6 +40,7 @@ https://repo.continuum.io/pkgs/free/linux-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/libxml2-2.9.2-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/markupsafe-0.23-py34_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/matplotlib-1.5.1-np111py34_0.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/networkx-1.11-py34_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nose-1.3.7-py34_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/numexpr-2.6.0-np111py34_nomkl_0.tar.bz2
@@ -64,6 +65,7 @@ https://repo.continuum.io/pkgs/free/linux-64/python-dateutil-2.5.3-py34_0.tar.bz
 https://repo.continuum.io/pkgs/free/linux-64/pytz-2016.6.1-py34_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/scikit-image-0.12.3-np111py34_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scikit-learn-0.17.1-np111py34_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scipy-0.17.1-np111py34_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/setuptools-26.1.1-py34_0.tar.bz2

linux/devel-py35.txt

@@ -40,6 +40,7 @@ https://repo.continuum.io/pkgs/free/linux-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/libxml2-2.9.2-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/markupsafe-0.23-py35_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/matplotlib-1.5.1-np111py35_0.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/networkx-1.11-py35_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/nose-1.3.7-py35_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/numexpr-2.6.0-np111py35_nomkl_0.tar.bz2
@@ -64,6 +65,7 @@ https://repo.continuum.io/pkgs/free/linux-64/python-dateutil-2.5.3-py35_0.tar.bz
 https://repo.continuum.io/pkgs/free/linux-64/pytz-2016.6.1-py35_0.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/linux-64/scikit-image-0.12.3-np111py35_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scikit-learn-0.17.1-np111py35_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/scipy-0.17.1-np111py35_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/linux-64/setuptools-26.1.1-py35_0.tar.bz2

macosx/devel-py27.txt

@@ -35,6 +35,7 @@ https://conda.anaconda.org/conda-forge/osx-64/libsvm-3.21-1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/markupsafe-0.23-py27_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/matplotlib-1.5.1-np111py27_0.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/networkx-1.11-py27_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nose-1.3.7-py27_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/numexpr-2.6.0-np111py27_nomkl_0.tar.bz2
@@ -57,6 +58,7 @@ https://repo.continuum.io/pkgs/free/osx-64/python-dateutil-2.5.3-py27_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/pytz-2016.6.1-py27_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/scikit-image-0.12.3-np111py27_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scikit-learn-0.17.1-np111py27_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scipy-0.17.1-np111py27_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/setuptools-26.1.1-py27_0.tar.bz2

macosx/devel-py34.txt

@@ -35,6 +35,7 @@ https://conda.anaconda.org/conda-forge/osx-64/libsvm-3.21-1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/markupsafe-0.23-py34_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/matplotlib-1.5.1-np111py34_0.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/networkx-1.11-py34_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nose-1.3.7-py34_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/numexpr-2.6.0-np111py34_nomkl_0.tar.bz2
@@ -56,6 +57,7 @@ https://repo.continuum.io/pkgs/free/osx-64/python-dateutil-2.5.3-py34_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/pytz-2016.6.1-py34_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/scikit-image-0.12.3-np111py34_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scikit-learn-0.17.1-np111py34_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scipy-0.17.1-np111py34_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/setuptools-26.1.1-py34_0.tar.bz2

macosx/devel-py35.txt

@@ -35,6 +35,7 @@ https://conda.anaconda.org/conda-forge/osx-64/libsvm-3.21-1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/libtiff-4.0.6-2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/markupsafe-0.23-py35_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/matplotlib-1.5.1-np111py35_0.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/networkx-1.11-py35_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nomkl-1.0-0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/nose-1.3.7-py35_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/numexpr-2.6.0-np111py35_nomkl_0.tar.bz2
@@ -56,6 +57,7 @@ https://repo.continuum.io/pkgs/free/osx-64/python-dateutil-2.5.3-py35_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/pytz-2016.6.1-py35_0.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/qt-4.8.7-4.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/readline-6.2-2.tar.bz2
+https://repo.continuum.io/pkgs/free/osx-64/scikit-image-0.12.3-np111py35_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scikit-learn-0.17.1-np111py35_nomkl_2.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/scipy-0.17.1-np111py35_nomkl_1.tar.bz2
 https://repo.continuum.io/pkgs/free/osx-64/setuptools-26.1.1-py35_0.tar.bz2