diff --git a/install/from-scratch.sh b/install/from-scratch.sh index 36331f89f432f1fa7e8c926df8a2caa947f1eacc..a147a8c618bcec6a457ced66adddad70b3ff655d 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