Skip to content

Commit b05c68b

Browse files
committed
Add pytest 6.2 to CI tests
- use request.config instead of unsupported testdir.config in test
1 parent 9e9c09a commit b05c68b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Infrastructure
66
- use codecov instead of coveralls, that is failing
7+
- added pytest 6.2 to CI tests
78

89
## [Version 0.9.3](https://pypi.org/project/pytest-order/0.9.3/) (2021-01-14)
910
Bugfix release.

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77

88
@pytest.fixture
9-
def item_names_for(testdir):
9+
def item_names_for(request, testdir):
1010
def _item_names_for(tests_content):
1111
items = testdir.getitems(tests_content)
12-
hook = testdir.config.hook
12+
hook = request.config.hook
1313
hook.pytest_collection_modifyitems(session=items[0].session,
14-
config=testdir.config, items=items)
14+
config=request.config, items=items)
1515
return [item.name for item in items]
1616

1717
return _item_names_for

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
envlist =
44
{py27,py35,py36,py37,py38,py39,pypy2,pypy3}-pytest{37,38,39,310,40,41,42,43,44,45,46}
55
{py35,py36,py37,py38,py39,pypy3}-pytest{50,51,52,53,54,60,61}
6+
{py36,py37,py38,py39,pypy3}-pytest62
67
[testenv]
78
deps =
89
pytest37: pytest>=3.7,<3.8
@@ -23,14 +24,15 @@ deps =
2324
pytest54: pytest>=5.4,<6.0
2425
pytest60: pytest>=6.0,<6.1
2526
pytest61: pytest>=6.1,<6.2
27+
pytest62: pytest>=6.2,<6.3
2628
pytest{40,41,42}: attrs<19.2
2729
pytest-cov<2.10
2830
pytest{37,38,39,310,40,41,42,43}: pytest-xdist<1.28.0
2931
pytest{44,45,46,50,51,52,53,54}: pytest-xdist<2.0.0
30-
pytest{60,61}: pytest-xdist
32+
pytest{60,61,62}: pytest-xdist
3133
pytest{37}: pytest-dependency<0.5.0
32-
pytest{38,39,310,40,41,42,43,44,45,46,50,51,52,53,54,60,61}: pytest-dependency
33-
pytest{37,38,39,310,40,41,42,43,44,45,46,50,51,52,53,54,60,61}: pytest-mock
34+
pytest{38,39,310,40,41,42,43,44,45,46,50,51,52,53,54,60,61,62}: pytest-dependency
35+
pytest{37,38,39,310,40,41,42,43,44,45,46,50,51,52,53,54,60,61,62}: pytest-mock
3436

3537
passenv = *
3638

0 commit comments

Comments
 (0)