Skip to content

Commit 675b0c9

Browse files
authored
Merge pull request #115 from skarzi/fix/tox/update-pytest-master-branch-name
fix pytest main branch name
2 parents 8c347f1 + 5e23715 commit 675b0c9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[tox]
22
distshare = {homedir}/.tox/distshare
3-
envlist = py38-pytest{46,50,51,52,53,54,60,61,62,latest,master},
3+
envlist = py38-pytest{46,50,51,52,53,54,60,61,62,latest,main},
44
py{36,37,39,310}-pytestlatest
55

66
[testenv]
77
commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs:tests}
88
deps =
99
pytestlatest: pytest
10-
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
10+
pytestmain: git+https://github.com/pytest-dev/pytest.git@main
1111
pytest62: pytest~=6.2.0
1212
pytest61: pytest~=6.1.0
1313
pytest60: pytest~=6.0.0
@@ -20,8 +20,8 @@ deps =
2020

2121
-r{toxinidir}/requirements-testing.txt
2222

23-
[testenv:py38-pytestmaster]
24-
# allow failures of tests run for `pytest` installed from `master` branch
23+
[testenv:py38-pytestmain]
24+
# allow failures of tests run for `pytest` installed from `main` branch
2525
ignore_outcome = true
2626

2727
[testenv:py310-pytestlatest]

0 commit comments

Comments
 (0)