Skip to content

Commit 1dc0197

Browse files
Use 'main' to refer to pytest default branch in tox env names. (#643)
Co-authored-by: Thomas Grainger <[email protected]> Co-authored-by: Bruno Oliveira <[email protected]>
1 parent d909dcc commit 1dc0197

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- "py37-pytestlatest"
1717
- "py38-pytestlatest"
1818
- "py39-pytestlatest"
19-
- "py38-pytestmaster"
19+
- "py38-pytestmain"
2020
- "py38-psutil"
2121
- "linting"
2222

@@ -32,7 +32,7 @@ jobs:
3232
python: "3.8"
3333
- tox_env: "py39-pytestlatest"
3434
python: "3.9"
35-
- tox_env: "py38-pytestmaster"
35+
- tox_env: "py38-pytestmain"
3636
python: "3.8"
3737
- tox_env: "py38-psutil"
3838
python: "3.8"

changelog/643.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use 'main' to refer to pytest default branch in tox env names.

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
envlist=
33
linting
44
py{35,36,37,38,39}-pytestlatest
5-
py38-pytestmaster
5+
py38-pytestmain
66
py38-psutil
77

88
[testenv]
99
extras = testing
1010
deps =
1111
pytestlatest: pytest
12-
pytestmaster: git+https://github.com/pytest-dev/pytest.git@main
12+
pytestmain: git+https://github.com/pytest-dev/pytest.git
1313
commands=
1414
pytest {posargs}
1515

0 commit comments

Comments
 (0)