Skip to content

Commit bcce691

Browse files
authored
Merge pull request #887 from effigies/mnt/update_minimum_matplotlib
MNT/FIX: Bump minimum matplotlib to 1.5.2 to match available wheels
2 parents 95c934b + 50265dc commit bcce691

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ env:
1515
- DEPENDS="numpy scipy matplotlib h5py pillow pydicom indexed_gzip"
1616
- INSTALL_TYPE="setup"
1717
- CHECK_TYPE="test"
18-
- OLD_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com"
1918
- EXTRA_WHEELS="https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com"
2019
- PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
21-
- EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS --find-links=$OLD_WHEELS"
20+
- EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
2221
- PRE_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
2322

2423
python:
@@ -45,7 +44,7 @@ matrix:
4544
# Absolute minimum dependencies plus oldest MPL
4645
- python: 3.5
4746
env:
48-
- DEPENDS="-r min-requirements.txt matplotlib==1.3.1"
47+
- DEPENDS="-r min-requirements.txt matplotlib==1.5.3"
4948
# Minimum pydicom dependency
5049
- python: 3.5
5150
env:

nibabel/tests/test_viewers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
from nose.tools import assert_raises, assert_true
2121

2222
# Need at least MPL 1.3 for viewer tests.
23-
matplotlib, has_mpl, _ = optional_package('matplotlib', min_version='1.3')
23+
# 2020.02.11 - 1.3 wheels are no longer distributed, so the minimum we test with is 1.5
24+
matplotlib, has_mpl, _ = optional_package('matplotlib', min_version='1.5')
2425

2526
needs_mpl = skipif(not has_mpl, 'These tests need matplotlib')
2627
if has_mpl:

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dev =
4949
gitpython
5050
twine
5151
doc =
52-
matplotlib >= 1.3.1
52+
matplotlib >= 1.5.3
5353
numpydoc
5454
sphinx >=0.3
5555
texext

0 commit comments

Comments
 (0)