diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3ea24b7c..7872f978a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: main
on:
push:
branches:
- - master
+ - main
- "[0-9]+.[0-9]+.x"
tags:
- "[0-9]+.[0-9]+.[0-9]+"
@@ -11,7 +11,7 @@ on:
pull_request:
branches:
- - master
+ - main
- "[0-9]+.[0-9]+.x"
jobs:
@@ -56,7 +56,7 @@ jobs:
- name: "windows-py37-pluggy"
python: "3.7"
os: windows-latest
- tox_env: "py37-pluggymaster-xdist"
+ tox_env: "py37-pluggymain-xdist"
- name: "windows-py38"
python: "3.8"
os: windows-latest
@@ -75,7 +75,7 @@ jobs:
- name: "ubuntu-py37-pluggy"
python: "3.7"
os: ubuntu-latest
- tox_env: "py37-pluggymaster-xdist"
+ tox_env: "py37-pluggymain-xdist"
- name: "ubuntu-py37-freeze"
python: "3.7"
os: ubuntu-latest
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 054f809a8..ba783d5c1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -236,7 +236,7 @@ Here is a simple overview, with pytest-specific bits:
$ cd pytest
# now, create your own branch off "master":
- $ git checkout -b your-bugfix-branch-name master
+ $ git checkout -b your-bugfix-branch-name main
Given we have "major.minor.micro" version numbers, bug fixes will usually
be released in micro releases whereas features will be released in
@@ -318,7 +318,7 @@ Here is a simple overview, with pytest-specific bits:
compare: your-branch-name
base-fork: pytest-dev/pytest
- base: master
+ base: main
Writing Tests
diff --git a/README.rst b/README.rst
index 159bf1d4f..d0014e8bf 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-.. image:: https://github.com/pytest-dev/pytest/raw/master/doc/en/img/pytest_logo_curves.svg
+.. image:: https://github.com/pytest-dev/pytest/raw/main/doc/en/img/pytest_logo_curves.svg
:target: https://docs.pytest.org/en/stable/
:align: center
:height: 200
@@ -16,14 +16,14 @@
.. image:: https://img.shields.io/pypi/pyversions/pytest.svg
:target: https://pypi.org/project/pytest/
-.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/main/graph/badge.svg
:target: https://codecov.io/gh/pytest-dev/pytest
:alt: Code coverage Status
.. image:: https://github.com/pytest-dev/pytest/workflows/main/badge.svg
:target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Amain
-.. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/master.svg
+.. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
:target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/master
:alt: pre-commit.ci status
@@ -151,8 +151,8 @@ Tidelift will coordinate the fix and disclosure.
License
-------
-Copyright Holger Krekel and others, 2004-2020.
+Copyright Holger Krekel and others, 2004-2021.
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
-.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE
diff --git a/doc/en/development_guide.rst b/doc/en/development_guide.rst
index 77076d483..3ee0ebbc2 100644
--- a/doc/en/development_guide.rst
+++ b/doc/en/development_guide.rst
@@ -4,4 +4,4 @@ Development Guide
The contributing guidelines are to be found :ref:`here <contributing>`.
The release procedure for pytest is documented on
-`GitHub <https://github.com/pytest-dev/pytest/blob/master/RELEASING.rst>`_.
+`GitHub <https://github.com/pytest-dev/pytest/blob/main/RELEASING.rst>`_.
diff --git a/doc/en/funcarg_compare.rst b/doc/en/funcarg_compare.rst
index 5e2a05006..0f44d1da0 100644
--- a/doc/en/funcarg_compare.rst
+++ b/doc/en/funcarg_compare.rst
@@ -168,7 +168,7 @@ pytest for a long time offered a pytest_configure and a pytest_sessionstart
hook which are often used to setup global resources. This suffers from
several problems:
-1. in distributed testing the master process would setup test resources
+1. in distributed testing the managing process would setup test resources
that are never needed because it only co-ordinates the test run
activities of the worker processes.
diff --git a/doc/en/index.rst b/doc/en/index.rst
index 7f7453402..cfe3a271e 100644
--- a/doc/en/index.rst
+++ b/doc/en/index.rst
@@ -129,8 +129,8 @@ Tidelift will coordinate the fix and disclosure.
License
-------
-Copyright Holger Krekel and others, 2004-2020.
+Copyright Holger Krekel and others, 2004-2021.
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
-.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE
diff --git a/doc/en/license.rst b/doc/en/license.rst
index c6c10bbf3..13765be15 100644
--- a/doc/en/license.rst
+++ b/doc/en/license.rst
@@ -29,4 +29,4 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE
diff --git a/testing/test_config.py b/testing/test_config.py
index 8c1441e06..b23264e1d 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -1780,7 +1780,7 @@ def test_invocation_args(pytester: Pytester) -> None:
)
def test_config_blocked_default_plugins(pytester: Pytester, plugin: str) -> None:
if plugin == "debugging":
- # Fixed in xdist master (after 1.27.0).
+ # Fixed in xdist (after 1.27.0).
# https://github.com/pytest-dev/pytest-xdist/pull/422
try:
import xdist # noqa: F401
diff --git a/tox.ini b/tox.ini
index 908f56ea6..da5a634de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ envlist =
py38
py39
pypy3
- py37-{pexpect,xdist,unittestextras,numpy,pluggymaster}
+ py37-{pexpect,xdist,unittestextras,numpy,pluggymain}
doctesting
plugins
py37-freeze
@@ -45,7 +45,7 @@ deps =
doctesting: PyYAML
numpy: numpy>=1.19.4
pexpect: pexpect>=4.8.0
- pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
+ pluggymain: pluggy @ git+https://github.com/pytest-dev/pluggy.git
pygments>=2.7.2
unittestextras: twisted
unittestextras: asynctest