From 906281a198e5534f6caea30c95dc3971854b5341 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 20 Dec 2016 14:41:29 +0100
Subject: [PATCH] Use menpo from github
---
install/from-scratch.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 36331f8..a147a8c 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -68,15 +68,16 @@ echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON
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
+ 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
+ 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 \
- menpo==0.7.5 \
- menpofit \
+ git+https://github.com/menpo/menpo@v0.7.5 \
+ git+https://github.com/menpo/menpofit@v0.4.1 \
schema \
pyedflib \
mne
--
GitLab