Skip to content

Commit 9c2ec45

Browse files
committed
Add more pytest versions, fix pytest-cov compatibility issue
- add pytest versions up to 5.4 - remove Python 3.4, add Python 3.8 - use pytest instead of py.test - use compatible versions of pytest-cov and attrs - fixes Travis.CI builds
1 parent 256dd16 commit 9c2ec45

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dist: xenial
22
language: python
33
python:
44
- "2.7"
5-
- "3.4"
65
- "3.5"
76
- "3.6"
87
- "3.7"
8+
- "3.8"
99
- "pypy"
1010
install:
1111
- pip install tox

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
'Programming Language :: Python :: 2',
4040
'Programming Language :: Python :: 2.7',
4141
'Programming Language :: Python :: 3',
42-
'Programming Language :: Python :: 3.4',
4342
'Programming Language :: Python :: 3.5',
4443
'Programming Language :: Python :: 3.6',
4544
'Programming Language :: Python :: 3.7',
45+
'Programming Language :: Python :: 3.8',
4646
'Programming Language :: Python :: Implementation :: PyPy',
4747
],
4848
)

tox.ini

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# content of: tox.ini, put in same dir as setup.py
22
[tox]
3-
envlist = {py27,py34,py35,py36,py37,pypy}-pytest{36,37,38,39,310,40,41,42,43,44,45}
3+
envlist =
4+
{py27,py35,py36,py37,py38,pypy}-pytest{36,37,38,39,310,40,41,42,43,44,45,46}
5+
{py35,py36,py37,py38}-pytest{50,51,52,53,54}
46
[testenv]
57
deps =
68
pytest36: pytest>=3.6,<3.7
@@ -14,7 +16,15 @@ deps =
1416
pytest43: pytest>=4.3,<4.4
1517
pytest44: pytest>=4.4,<4.5
1618
pytest45: pytest>=4.5,<4.6
17-
pytest-cov
19+
pytest46: pytest>=4.6,<5.0
20+
pytest50: pytest>=5.0,<5.1
21+
pytest51: pytest>=5.1,<5.2
22+
pytest52: pytest>=5.2,<5.3
23+
pytest53: pytest>=5.3,<5.4
24+
pytest54: pytest>=5.4,<6.0
25+
pytest{40,41,42}: attrs<19.2
26+
pytest-cov<2.10
27+
1828
commands =
19-
coverage run --source=pytest_ordering -m py.test tests
29+
coverage run --source=pytest_ordering -m pytest tests
2030
coverage report -m --fail-under=95

0 commit comments

Comments
 (0)