Skip to content

Commit 295e065

Browse files
Merge pull request #36 from webknjaz/features/test-matrix-upgrade
Upgrade the test matrix with newer envs
2 parents 2a69440 + a269598 commit 295e065

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

.travis.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1-
sudo: false
21
language: python
32
python:
3+
- '3.8'
44
- '2.7'
5-
- '3.5'
6-
- '3.6'
75
- '3.7'
6+
- '3.6'
7+
- '3.5'
88
cache: pip
99
install: pip install -U tox setuptools_scm
1010
env:
1111
matrix:
12-
- TOXENV=py-pytest31
13-
- TOXENV=py-pytest40
12+
- TOXENV=py-pytest310
13+
- TOXENV=py-pytest46
14+
- TOXENV=py-pytest54
1415
- TOXENV=py-pytestlatest
1516
matrix:
17+
exclude:
18+
- python: '2.7' # pytest 5+ does not support Python 2
19+
env: TOXENV=py-pytest54
1620
include:
17-
- python: '3.7'
21+
- python: '3.8'
1822
env: TOXENV=flakes
19-
- python: '3.7'
23+
- python: '3.8'
2024
env: TOXENV=readme
2125

2226
# piggyback on existing build for releases

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
minversion = 3.7.0
44
isolated_build = true
55
envlist=
6-
py{27,35,36}-pytest{31,40,latest}
6+
py{27,35,36,37,38}-pytest{310,46,54,latest}
77
flakes
88
readme
99

@@ -12,8 +12,9 @@ deps =
1212
pycmd
1313
# to avoid .eggs
1414
setuptools_scm
15-
pytest31: pytest~=3.1
16-
pytest40: pytest~=4.0
15+
pytest310: pytest~=3.10
16+
pytest46: pytest~=4.6
17+
pytest54: pytest~=5.4
1718
pytestlatest: pytest
1819
platform=linux|darwin
1920
commands=

0 commit comments

Comments
 (0)