Skip to content

Commit c19f5bf

Browse files
committed
Fixes to tox and CI
1 parent 5f41a2d commit c19f5bf

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@ language: python
22

33
sudo: false
44

5-
os:
6-
- linux
7-
- windows
8-
- osx
9-
105
env:
116
global:
127
- SETUP_XVFB=True
8+
- MPLBACKEND=Agg
139
- TOXENV='test'
1410
- TOXARGS='-v'
1511
- TOXPOSARGS=''
1612

1713
matrix:
1814
include:
15+
# Test all configurations on Linux
1916
- python: 2.7
2017
env: TOXENV=py27-test-mpl15
2118
- python: 3.5
@@ -32,8 +29,13 @@ matrix:
3229
env: TOXENV=py38-test-minimal
3330
- python: 3.8
3431
env: TOXENV=codestyle
32+
# Also test the oldest and newest configuration on Mac and Windows
33+
- os: osx
34+
env: PYTHON_VERSION=2.7 TOXENV=py27-test-mpl15
3535
- os: osx
3636
env: PYTHON_VERSION=3.8 TOXENV=py38-test-mpl31
37+
- os: windows
38+
env: PYTHON_VERSION=2.7 TOXENV=py27-test-mpl15
3739
- os: windows
3840
env: PYTHON_VERSION=3.8 TOXENV=py38-test-mpl31
3941

@@ -43,7 +45,7 @@ install:
4345
source ci-helpers/travis/setup_conda.sh;
4446
fi
4547

46-
script:
48+
script:
4749
- pip install tox
4850
- tox $TOXARGS -- $TOXPOSARGS
4951

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ requires =
77
pip >= 19.3.1
88

99
[testenv]
10-
passenv = DISPLAY
10+
passenv = DISPLAY MPLBACKEND WINDIR
1111
changedir = .tmp/{envname}
1212
description = run tests
1313
deps =

0 commit comments

Comments
 (0)