Skip to content

Commit

Permalink
FIX: Move to 3.6 [circle front]
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Sep 8, 2017
1 parent 4bc6b08 commit 6dfdfe8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ matrix:

# Setup anaconda
before_install:
# Mayavi needs a display to build via pip (?!)
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset;
fi;
- git clone https://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda.sh
# Don't source mne_setup_sh here because changing PATH etc. can't be done in a script
Expand All @@ -89,9 +93,6 @@ before_install:
else
MNE_DIRS="";
fi
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset;
fi;

install:
# Need to uninstall the PIP-installed version
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: mne
channels:
- defaults
- menpo # Needed for VTK
- clinicalgraphics # Needed for VTK
dependencies:
- python=3.5
- python=3.6
- pip
- mkl
- numpy
Expand Down

0 comments on commit 6dfdfe8

Please sign in to comment.