Merge branch 'add_virtualenv' into 'master'

Add virtualenv to the list of installed packages (no specific version required)



See merge request !12

install/from-scratch.sh

@@ -52,7 +52,8 @@ if [[ "$PYTHON_VERSION" == "2.7" ]]; then
     scipy=0.17.1 \
     sqlalchemy=1.0.13=py27_0 \
     dask=0.10.0=py27_0 \
-    scikit-image=0.12.3=np111py27_1
+    scikit-image=0.12.3=np111py27_1 \
+    virtualenv
 fi
 if [[ "$PYTHON_VERSION" == "3.4" ]]; then
   ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \
@@ -76,7 +77,8 @@ if [[ "$PYTHON_VERSION" == "3.4" ]]; then
     scipy=0.17.1 \
     sqlalchemy=1.0.13=py34_0 \
     dask=0.10.0=py34_0 \
-    scikit-image=0.12.3=np111py34_1
+    scikit-image=0.12.3=np111py34_1 \
+    virtualenv
 fi
 if [[ "$PYTHON_VERSION" == "3.5" ]]; then
   ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \
@@ -100,7 +102,8 @@ if [[ "$PYTHON_VERSION" == "3.5" ]]; then
     scipy=0.17.1 \
     sqlalchemy=1.0.13=py35_0 \
     dask=0.10.0=py35_0 \
-    scikit-image=0.12.3=np111py35_1
+    scikit-image=0.12.3=np111py35_1 \
+    virtualenv
 fi
 
 ${CONDA} install --yes -n ${NAME} --override-channels -c defaults \