Skip to content

Commit b76fff4

Browse files
adopt main terminology in the configs
ref pytest-dev/meta#8
1 parent 38d8deb commit b76fff4

File tree

9 files changed

+14
-15
lines changed

9 files changed

+14
-15
lines changed

CONTRIBUTING.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ Short version
199199
#. Follow **PEP-8** for naming and `black <https://github.com/psf/black>`_ for formatting.
200200
#. Tests are run using ``tox``::
201201

202-
tox -e linting,py37
203202

204203
The test environments above are usually enough to cover most cases locally.
205204

@@ -236,7 +235,7 @@ Here is a simple overview, with pytest-specific bits:
236235
$ cd pytest
237236
# now, create your own branch off "master":
238237

239-
$ git checkout -b your-bugfix-branch-name master
238+
$ git checkout -b your-bugfix-branch-name main
240239

241240
Given we have "major.minor.micro" version numbers, bug fixes will usually
242241
be released in micro releases whereas features will be released in
@@ -318,7 +317,7 @@ Here is a simple overview, with pytest-specific bits:
318317
compare: your-branch-name
319318

320319
base-fork: pytest-dev/pytest
321-
base: master
320+
base: main
322321

323322

324323
Writing Tests

HOWTORELEASE.rst

Whitespace-only changes.

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. image:: https://github.com/pytest-dev/pytest/raw/master/doc/en/img/pytest_logo_curves.svg
1+
.. image:: https://github.com/pytest-dev/pytest/raw/main/doc/en/img/pytest_logo_curves.svg
22
:target: https://docs.pytest.org/en/stable/
33
:align: center
44
:height: 200
@@ -16,14 +16,14 @@
1616
.. image:: https://img.shields.io/pypi/pyversions/pytest.svg
1717
:target: https://pypi.org/project/pytest/
1818

19-
.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/master/graph/badge.svg
19+
.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/main/graph/badge.svg
2020
:target: https://codecov.io/gh/pytest-dev/pytest
2121
:alt: Code coverage Status
2222

2323
.. image:: https://github.com/pytest-dev/pytest/workflows/main/badge.svg
2424
:target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Amain
2525

26-
.. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/master.svg
26+
.. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
2727
:target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/master
2828
:alt: pre-commit.ci status
2929

@@ -151,8 +151,8 @@ Tidelift will coordinate the fix and disclosure.
151151
License
152152
-------
153153

154-
Copyright Holger Krekel and others, 2004-2020.
154+
Copyright Holger Krekel and others, 2004-2021.
155155

156156
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
157157

158-
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
158+
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE

azure-pipelines.yml

Whitespace-only changes.

doc/en/funcarg_compare.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ pytest for a long time offered a pytest_configure and a pytest_sessionstart
168168
hook which are often used to setup global resources. This suffers from
169169
several problems:
170170

171-
1. in distributed testing the master process would setup test resources
171+
1. in distributed testing the managing process would setup test resources
172172
that are never needed because it only co-ordinates the test run
173173
activities of the worker processes.
174174

doc/en/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ Tidelift will coordinate the fix and disclosure.
129129
License
130130
-------
131131

132-
Copyright Holger Krekel and others, 2004-2020.
132+
Copyright Holger Krekel and others, 2004-2021.
133133

134134
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
135135

136-
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
136+
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE

doc/en/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
2929
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3030
SOFTWARE.
3131
32-
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
32+
.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE

testing/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,7 @@ class DummyPlugin:
17801780
)
17811781
def test_config_blocked_default_plugins(pytester: Pytester, plugin: str) -> None:
17821782
if plugin == "debugging":
1783-
# Fixed in xdist master (after 1.27.0).
1783+
# Fixed in xdist (after 1.27.0).
17841784
# https://github.com/pytest-dev/pytest-xdist/pull/422
17851785
try:
17861786
import xdist # noqa: F401

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ envlist =
99
py38
1010
py39
1111
pypy3
12-
py37-{pexpect,xdist,unittestextras,numpy,pluggymaster}
12+
py37-{pexpect,xdist,unittestextras,numpy,pluggymain}
1313
doctesting
1414
plugins
1515
py37-freeze
@@ -45,7 +45,7 @@ deps =
4545
doctesting: PyYAML
4646
numpy: numpy>=1.19.4
4747
pexpect: pexpect>=4.8.0
48-
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
48+
pluggymain: pluggy @ git+https://github.com/pytest-dev/pluggy.git
4949
pygments>=2.7.2
5050
unittestextras: twisted
5151
unittestextras: asynctest

0 commit comments

Comments
 (0)