diff --git a/.gitignore b/.gitignore index d53e304ac88ab11c0e7602586ccae9510b952476..4a4a6c0515c95a26a3ea31a3aba39efae4e07a20 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.swp *.swo *.whl +install/bob-devel-py*.yml diff --git a/install/bob-devel.yml b/install/bob-devel.yml deleted file mode 100644 index d570a36e995cc20bf1dfb2f411862ea7e774b788..0000000000000000000000000000000000000000 --- a/install/bob-devel.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: bob-devel -channels: -- https://www.idiap.ch/software/bob/conda -- defaults -dependencies: -- python=2.7 -- cython -- dask -- hdf5 -- jpeg -- libpng -- libtiff -- matplotlib -- nose -- numexpr -- numpy -- pillow -- pip -- psutil -- scikit-image -- scikit-learn -- scipy -- sphinx -- sqlalchemy -- anaconda=4.2.0 # [only linux] -- anaconda=4.3.0 # [only osx] -- boost=1.61 -- caffe # [only linux] -- cmake -- coverage -- cyvlfeat=0.4.5 -- docopt -- ffmpeg=2.8.10 -- gcc=4.8.5 # [only linux] -- libgcc=4.8.5 # [only linux] -- giflib=5.1.4 -- ipdb=0.10.2 -- ipython -- libblitz=0.10 -- libmatio=1.5 -- libsvm=3.21 -- menpo=0.7.7 -- menpofit=0.4.1 -- menpowidgets=0.2.1p3 -- mne=0.13.1 -- openblas=0.2.19 -- opencv=3 -- pkgtools=0.7.3 -- pkg-config -- pyedflib=0.1.6 -- schema=0.6.5 -- sox=14.4.2 -- sphinx_rtd_theme -- toolchain=2.3.1 -- vlfeat=0.9.20 -- zc.buildout=2.9.2 -- pip: - - tensorflow==1.0.1 diff --git a/install/from-scratch.sh b/install/from-scratch.sh index 10e532652ce510c94a316c295668819667cd5c19..4bbaf2f5fd7946a26692a3ac7b26e19bec27d3db 100755 --- a/install/from-scratch.sh +++ b/install/from-scratch.sh @@ -12,8 +12,9 @@ fi BASEDIR=$1 NAME=$2 PYTHON_VERSION=$3 +PYVER=`echo $PYTHON_VERSION | sed -e 's/\.//'` CONDA=${BASEDIR}/bin/conda -YML=bob-devel.yml +YML=bob-devel-py${PYVER}.yml if [ -d ${BASEDIR}/envs/${NAME} ]; then ${CONDA} remove -n ${NAME} --all --yes