Skip to content

Commit 2123f19

Browse files
author
Michael Howitz
committed
Adapt to pytest's switch to main as default branch.
1 parent 4b5800e commit 2123f19

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
"6.0.*",
3535
"6.1.*",
3636
"6.2.*",
37-
"master",
37+
"main",
3838
]
3939
steps:
4040
- uses: actions/checkout@v2
@@ -61,8 +61,8 @@ jobs:
6161
- name: Install dependencies
6262
run: |
6363
python -m pip install -U pip
64-
if [[ '${{ matrix.pytest-version }}' == 'master' ]]; then
65-
python -m pip install git+https://github.com/pytest-dev/pytest.git@master#egg=pytest
64+
if [[ '${{ matrix.pytest-version }}' == 'main' ]]; then
65+
python -m pip install git+https://github.com/pytest-dev/pytest.git@main#egg=pytest
6666
else
6767
python -m pip install pytest==${{ matrix.pytest-version }}
6868
fi

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ deps =
2222
pytest60: pytest==6.0.*
2323
pytest61: pytest==6.1.*
2424
pytest62: pytest==6.2.*
25-
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master#egg=pytest
25+
pytestmain: git+https://github.com/pytest-dev/pytest.git@main#egg=pytest
2626

2727
[testenv:linting]
2828
basepython = python3

0 commit comments

Comments
 (0)