diff --git a/from-scratch.sh b/from-scratch.sh old mode 100755 new mode 100644 index 04cb7025625d67b0149664d536dac6a07c08067a..9d4bae7417ec1aca99e7287a38e4dee5d3ee7037 --- 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 \ diff --git a/linux/devel-py27.txt b/linux/devel-py27.txt index c9e602b5946681ee6411055c723afbe954abf114..275fd68629fe47742c8e08f47a112a425c3ba90b 100644 --- a/linux/devel-py27.txt +++ b/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 diff --git a/linux/devel-py34.txt b/linux/devel-py34.txt index a286b3a84330de66f8ecdf23368093871661a34d..2bb199ceac95d8936913d2c2080af2d97e1edf78 100644 --- a/linux/devel-py34.txt +++ b/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 diff --git a/linux/devel-py35.txt b/linux/devel-py35.txt index 5340ca3e37d9452c96c32ca0d692d617341426f4..d446159c327f5f1c534d3b2842f49c110b4c81e2 100644 --- a/linux/devel-py35.txt +++ b/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 diff --git a/macosx/devel-py27.txt b/macosx/devel-py27.txt index ef2d683507b6ae7fa6058870ecc14fa995cce8ea..3e5ca99e23374a576dbcf703fa3bdf068ac36575 100644 --- a/macosx/devel-py27.txt +++ b/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 diff --git a/macosx/devel-py34.txt b/macosx/devel-py34.txt index ec089a59ded5dd78409b1b60a022123056d269c0..0de3f7ca1a3a61ad38c451c9bebc08555c886b13 100644 --- a/macosx/devel-py34.txt +++ b/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 diff --git a/macosx/devel-py35.txt b/macosx/devel-py35.txt index 2fd5fee0be3da881a0522fd056f32a8b91a33a5e..b2175d4f91b5f4381d384c4690fdfd39291145d9 100644 --- a/macosx/devel-py35.txt +++ b/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