MAINT: Update fsaverage

Author: larsoner

.circleci/config.yml

@@ -25,12 +25,6 @@ jobs:
                 git fetch upstream master;
               fi
 
-        # Load our data
-        - restore_cache:
-            keys:
-              - data-cache-0
-              - pip-cache
-
         - run:
             name: Spin up Xvfb
             command: |
@@ -43,11 +37,18 @@ jobs:
             command: |
               sudo apt-get install qt5-default
 
+        # Load our data
+        - restore_cache:
+            keys:
+              - data-cache-0
+              - pip-cache
+
         - run:
             name: Get Python running
             command: |
               pip install --user -q --upgrade pip numpy
               pip install --user -q --upgrade --progress-bar off scipy matplotlib vtk pyqt5 pyqt5-sip nibabel sphinx numpydoc pillow imageio imageio-ffmpeg https://api.github.com/repos/sphinx-gallery/sphinx-gallery/zipball/master mayavi
+              pip install --user -q --upgrade "https://api.github.com/repos/mne-tools/mne-python/zipball/master"
         - save_cache:
             key: pip-cache
             paths:
@@ -59,17 +60,18 @@ jobs:
             command: |
               LIBGL_DEBUG=verbose python -c "from mayavi import mlab; import matplotlib.pyplot as plt; mlab.figure(); plt.figure()"
               echo $SUBJECTS_DIR
+
         - run:
             name: Get data
             command: |
-              if [ ! -d $SUBJECTS_DIR ]; then
-                mkdir $SUBJECTS_DIR;
-                cd $SUBJECTS_DIR;
-                wget http://faculty.washington.edu/larsoner/fsaverage_min.zip;
-                unzip fsaverage_min.zip;
-                rm fsaverage_min.zip;
-              fi;
+              mkdir -p $SUBJECTS_DIR;
+              python -c "import mne; mne.datasets.fetch_fsaverage(verbose=True)"
               ls $SUBJECTS_DIR
+        - save_cache:
+            key: data-cache-0
+            paths:
+              - "~/subjects"
+
         - run:
             name: Install PySurfer
             command: |
@@ -85,15 +87,10 @@ jobs:
             path: doc/_build/html/
             destination: html
 
-        - save_cache:
-            key: data-cache-0
-            paths:
-              - "~/subjects"
 
 workflows:
   version: 2
 
   default:
     jobs:
       - build_docs
-

.travis.yml

@@ -1,11 +1,14 @@
 language: c
 sudo: false
-
+dist: xenial
+services:
+    - xvfb
 env:
     global: PYTHON_VERSION=3.7
             CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt>=5.9 coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
             PIP_DEPENDENCIES="codecov pytest-sugar pytest-faulthandler nibabel imageio imageio-ffmpeg"
             DISPLAY=:99.0
+            SUBJECTS_DIR=~/subjects
 
 matrix:
     include:
@@ -32,32 +35,21 @@ before_install:
     - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
         unset -f cd;
       fi;
-    - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-        echo "Starting Xvfb...";
-        /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;
-      fi;
     - git clone https://github.com/astropy/ci-helpers.git
     - source ci-helpers/travis/setup_conda.sh
     - if [ "$PYTHON_VERSION" != "2.7" ]; then
         pip install vtk;
         pip install mayavi;
       fi;
+    - mkdir -p $SUBJECTS_DIR
+    - pip install "https://api.github.com/repos/mne-tools/mne-python/zipball/master"
+    - python -c "import mne; mne.datasets.fetch_fsaverage(verbose=True)"
 
 install:
     - python setup.py build
     - python setup.py install
     - SRC_DIR=$(pwd)
 
-before_script:
-    # Let's create a (fake) display on Travis, and let's use a funny resolution
-    - cd ~
-    - wget --quiet http://faculty.washington.edu/larsoner/fsaverage_min.zip
-    - mkdir subjects
-    - cd subjects
-    - unzip ../fsaverage_min.zip
-    - cd ..
-    - export SUBJECTS_DIR="${PWD}/subjects"
-
 script:
     - cd ${SRC_DIR}
     - pytest surfer --cov=surfer -v