Skip to content

Commit d805795

Browse files
committed
fix: update conda
1 parent 99240e0 commit d805795

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ python:
44
- 2.7
55
# Setup anaconda
66
before_install:
7-
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-2.2.2-Linux-x86_64.sh -O miniconda.sh; fi
7+
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.0.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.0.0-Linux-x86_64.sh -O miniconda.sh; fi
88
- chmod +x miniconda.sh
99
- ./miniconda.sh -b
1010
- export PATH=/home/travis/anaconda/bin:$PATH
@@ -18,6 +18,7 @@ before_install:
1818

1919
# Install packages
2020
install:
21+
- conda update --yes conda
2122
- conda create -n testenv --yes pip python=$TRAVIS_PYTHON_VERSION
2223
- source activate testenv
2324
- conda install --yes numpy scipy nose traits networkx dateutil

Vagrantfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ $script = <<SCRIPT
2020
# qconf -aattr queue slots "2, [neuro=3]" main.q
2121
2222
# install anaconda
23-
wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh
23+
wget http://repo.continuum.io/miniconda/Miniconda-3.0.0-Linux-x86_64.sh -O miniconda.sh
2424
chmod +x miniconda.sh
2525
./miniconda.sh -b
2626
echo "export PATH=$HOME/anaconda/bin:\\$PATH" >> .bashrc
2727
2828
# install nipype dependencies
29+
$HOME/anaconda/bin/conda update --yes conda
2930
$HOME/anaconda/bin/conda install --yes pip numpy scipy nose traits networkx
3031
$HOME/anaconda/bin/conda install --yes dateutil ipython-notebook matplotlib
3132
$HOME/anaconda/bin/pip install nibabel --use-mirrors

0 commit comments

Comments
 (0)