Skip to content

Commit b0eef48

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

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ os:
1010
env:
1111
global:
1212
- SETUP_XVFB=True
13+
- MPLBACKEND=Agg
1314
- TOXENV='test'
1415
- TOXARGS='-v'
1516
- TOXPOSARGS=''
1617

1718
matrix:
1819
include:
20+
# Test all configurations on Linux
1921
- python: 2.7
2022
env: TOXENV=py27-test-mpl15
2123
- python: 3.5
@@ -32,8 +34,13 @@ matrix:
3234
env: TOXENV=py38-test-minimal
3335
- python: 3.8
3436
env: TOXENV=codestyle
37+
# Also test the oldest and newest configuration on Mac and Windows
38+
- os: osx
39+
env: PYTHON_VERSION=2.7 TOXENV=py27-test-mpl15
3540
- os: osx
3641
env: PYTHON_VERSION=3.8 TOXENV=py38-test-mpl31
42+
- os: windows
43+
env: PYTHON_VERSION=2.7 TOXENV=py27-test-mpl15
3744
- os: windows
3845
env: PYTHON_VERSION=3.8 TOXENV=py38-test-mpl31
3946

@@ -43,7 +50,7 @@ install:
4350
source ci-helpers/travis/setup_conda.sh;
4451
fi
4552

46-
script:
53+
script:
4754
- pip install tox
4855
- tox $TOXARGS -- $TOXPOSARGS
4956

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)