Skip to content

Commit 544082a

Browse files
committed
MAINT: Sisyphus
1 parent dbbe24b commit 544082a

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

.circleci/config.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ jobs:
2323

2424
# Fix libgcc_s.so.1 pthread_cancel bug:
2525
# https://github.com/ContinuumIO/anaconda-issues/issues/9190#issuecomment-386508136
26-
# https://github.com/golemfactory/golem/issues/1019
27-
- run: sudo apt-get install libgl1-mesa-glx libegl1-mesa libxrandr2 libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 qt5-default
26+
- run: sudo apt-get install libgl1-mesa-glx libegl1-mesa libxrandr2 libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6
2827
- run: echo "export SUBJECTS_DIR=~/subjects" >> $BASH_ENV
2928
- run: echo "export PATH=~/.local/bin:$PATH" >> $BASH_ENV
30-
- run: echo "export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0.4200.1" >> $BASH_ENV
3129
# Spin up Xvfb
3230
- run: echo "export DISPLAY=:99" >> $BASH_ENV
3331
- run: /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;
3432
# Python env
35-
- run: pip install -U --user --progress-bar off numpy scipy matplotlib vtk PyQt5 sip PyQt5-sip nibabel sphinx numpydoc pillow imageio https://api.github.com/repos/sphinx-gallery/sphinx-gallery/zipball/master
36-
- run: pip install -U --user --progress-bar off mayavi
33+
- run: pip install -U --user --progress-bar off numpy scipy matplotlib vtk "PyQt5<5.12" nibabel sphinx numpydoc pillow imageio imageio-ffmpeg https://api.github.com/repos/sphinx-gallery/sphinx-gallery/zipball/master mayavi
3734
- save_cache:
3835
key: pip-cache
3936
paths:

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sudo: false
44
env:
55
global: PYTHON_VERSION=3.6
66
CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt>=5.9 coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
7-
PIP_DEPENDENCIES="codecov pytest-sugar pytest-faulthandler nibabel imageio"
7+
PIP_DEPENDENCIES="codecov pytest-sugar pytest-faulthandler nibabel imageio imageio-ffmpeg"
88
DISPLAY=:99.0
99

1010
matrix:
@@ -20,7 +20,7 @@ matrix:
2020
- os: linux
2121
env: PYTHON_VERSION=2.7
2222
CONDA_DEPENDENCIES="numpy scipy matplotlib coverage pytest pytest-cov flake8 mayavi"
23-
PIP_DEPENDENCIES="codecov pytest-sugar faulthandler pytest-faulthandler nibabel imageio"
23+
PIP_DEPENDENCIES="codecov pytest-sugar faulthandler pytest-faulthandler nibabel imageio imageio-ffmpeg"
2424

2525
# OSX
2626
- os: osx
@@ -57,9 +57,6 @@ before_script:
5757
- unzip ../fsaverage_min.zip
5858
- cd ..
5959
- export SUBJECTS_DIR="${PWD}/subjects"
60-
- if [[ $PIP_DEPENDENCIES == *"imageio"* ]] || [ ! -z "$CONDA_ENVIRONMENT" ]; then
61-
python -c "import imageio; imageio.plugins.ffmpeg.download()";
62-
fi
6360

6461
script:
6562
- cd ${SRC_DIR}

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ environment:
66
install:
77
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
88
- "python --version"
9-
- "pip install numpy scipy matplotlib nose pillow pytest pytest-cov pytest-faulthandler coverage imageio codecov pyqt5==5.9"
9+
- "pip install numpy scipy matplotlib nose pillow pytest pytest-cov pytest-faulthandler coverage imageio imageio-ffmpeg codecov pyqt5==5.9"
1010
- "pip install traits traitsui pyface vtk mayavi nibabel"
11-
- "python -c \"import imageio; imageio.plugins.ffmpeg.download()\""
1211
- "powershell make/get_fsaverage.ps1"
1312
- "python setup.py develop"
1413
- "SET SUBJECTS_DIR=%CD%\\subjects"

0 commit comments

Comments
 (0)