Merge branch 'issue_30' into 'master'

Move required wheels into from-scratch (closes #30)

See merge request !23

install/extra-wheels.sh

-#!/usr/bin/env bash
-# Wed 17 Aug 2016 13:50:05 CEST
-
-# Set the versions here
-CYVLFEAT="git+https://github.com/menpo/cyvlfeat@v0.4.5"
-MENPO="pathlib==1.0 git+https://github.com/menpo/menpo@v0.7.5 git+https://github.com/menpo/menpofit@v0.4.1"
-SCHEMA="schema"
-RRPG="pyedflib mne"
-
-if [ "${#}" != 2 ]; then
-  echo "usage: `basename $0` <basedir> <name>"
-  echo "example: `basename $0` /opt/conda bob-devel-py34"
-  exit 1
-fi
-
-echo "[>>] Activating conda environment ${2}..."
-source ${1}/bin/activate ${2}
-
-if [ "${?}" != 0 ]; then
-  echo "[error] Activating conda environment - check your settings"
-  exit 1
-fi
-
-echo "[>>] Generating wheels..."
-if [ "$(uname)" == "Linux" ]; then
-  CFLAGS="-I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-rpath=${CONDA_PREFIX}/lib" pip --no-cache-dir wheel --no-deps ${CYVLFEAT}
-else
-  CFLAGS="-I${CONDA_PREFIX}/include -mmacosx-version-min=10.9" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-headerpad_max_install_names" pip --no-cache-dir wheel --no-deps ${CYVLFEAT}
-fi
-pip --no-cache-dir wheel --no-deps ${MENPO}
-pip --no-cache-dir wheel --no-deps ${SCHEMA}
-pip --no-cache-dir wheel --no-deps ${RRPG}

install/from-scratch.sh

@@ -43,7 +43,7 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
   libpng \
   libsvm \
   libtiff \
-  matplotlib \
+  matplotlib=1 \
   nose \
   numexpr \
   numpy \
@@ -64,5 +64,23 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
   vlfeat
   #caffe
 
+echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
+source ${BASEDIR}/bin/activate ${NAME}
+
+# Cyvlfeat requires special instructions
+cyvlfeat=git+https://github.com/menpo/cyvlfeat@v0.4.5
+if [ "$(uname)" == "Linux" ]; then
+  CFLAGS="-I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-rpath=${CONDA_PREFIX}/lib" pip --no-cache-dir install ${cyvlfeat}
+else
+  CFLAGS="-I${CONDA_PREFIX}/include -mmacosx-version-min=10.9" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-headerpad_max_install_names" pip --no-cache-dir install ${cylvfeat}
+fi
+
+pip --no-cache-dir install \
+  git+https://github.com/menpo/menpo@v0.7.5 \
+  git+https://github.com/menpo/menpofit@v0.4.1 \
+  schema \
+  pyedflib \
+  mne
+
 echo "[>>] Bye!"
 exit 0

install/upload-wheels.sh

-#!/usr/bin/env bash
-# Wed 17 Aug 2016 13:50:05 CEST
-
-if [ "${#}" = 0 ]; then
-  echo "usage: `basename $0` <wheels>"
-  echo "example: `basename $0` *.whl"
-  exit 1
-fi
-
-SERVER=https://www.idiap.ch/software/bob/wheels-upload/gitlab/
-
-echo -n "Username: "
-read username
-echo -n "Password: "
-read -s password
-echo ""
-
-for wheel in ${@}; do
-  echo "[>>] Uploading ${wheel}..."
-  curl --silent --user "${username}:${password}" --insecure --upload-file ${wheel} ${SERVER}
-  if [ $? != 0 ]; then
-    echo "[error] curl command finished with an error condition"
-    exit 1
-  fi
-done