Merge pull request #9042 from nicoddemus/backport-9040

Author: nicoddemus

Diff for: .github/workflows/main.yml

@@ -3,15 +3,15 @@ name: main
 on:
   push:
     branches:
-      - master
+      - main
       - "[0-9]+.[0-9]+.x"
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
 
   pull_request:
     branches:
-      - master
+      - main
       - "[0-9]+.[0-9]+.x"
 
 # Set permissions at the job level.
@@ -64,7 +64,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
@@ -91,7 +91,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 for: 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 for: README.rst

@@ -1,4 +1,4 @@
-.. image:: https://docs.pytest.org/en/stable/_static/pytest1.png
+.. 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
    :alt: pytest
@@ -15,7 +15,7 @@
 .. 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
 
@@ -25,6 +25,10 @@
 .. 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/main.svg
+   :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/master
+   :alt: pre-commit.ci status
+
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :target: https://github.com/psf/black
 
@@ -149,8 +153,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 for: 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 for: 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 for: 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 for: doc/en/reference.rst

@@ -920,11 +920,8 @@ TestReport
 _Result
 ~~~~~~~
 
-Result used within :ref:`hook wrappers <hookwrapper>`.
+Result object used within :ref:`hook wrappers <hookwrapper>`, see :py:class:`_Result in the pluggy documentation <pluggy._callers._Result>` for more information.
 
-.. autoclass:: pluggy.callers._Result
-.. automethod:: pluggy.callers._Result.get_result
-.. automethod:: pluggy.callers._Result.force_result
 
 Global Variables
 ----------------

Diff for: doc/en/requirements.txt

@@ -1,4 +1,5 @@
 pallets-sphinx-themes
+pluggy>=1.0
 pygments-pytest>=1.1.0
 sphinx-removed-in>=0.2.0
 sphinx>=3.1,<4

Diff for: setup.cfg

@@ -45,7 +45,7 @@ install_requires =
     attrs>=19.2.0
     iniconfig
     packaging
-    pluggy>=0.12,<1.0.0a1
+    pluggy>=0.12,<2.0
     py>=1.8.2
     toml
     atomicwrites>=1.0;sys_platform=="win32"

Diff for: testing/python/metafunc.py

@@ -448,10 +448,7 @@ def test_idmaker_enum(self) -> None:
         enum = pytest.importorskip("enum")
         e = enum.Enum("Foo", "one, two")
         result = idmaker(("a", "b"), [pytest.param(e.one, e.two)])
-        if sys.version_info[:2] >= (3, 10):
-            assert result == ["one-two"]
-        else:
-            assert result == ["Foo.one-Foo.two"]
+        assert result == ["Foo.one-Foo.two"]
 
     def test_idmaker_idfn(self) -> None:
         """#351"""

Diff for: testing/test_config.py

@@ -1780,7 +1780,7 @@ class DummyPlugin:
 )
 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 for: testing/test_pytester.py

@@ -741,16 +741,10 @@ def test_run_result_repr() -> None:
 
     # known exit code
     r = pytester.RunResult(1, outlines, errlines, duration=0.5)
-    if sys.version_info[:2] >= (3, 10):
-        assert repr(r) == (
-            "<RunResult ret=TESTS_FAILED len(stdout.lines)=3"
-            " len(stderr.lines)=4 duration=0.50s>"
-        )
-    else:
-        assert repr(r) == (
-            "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
-            " len(stderr.lines)=4 duration=0.50s>"
-        )
+    assert (
+        repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
+        " len(stderr.lines)=4 duration=0.50s>"
+    )
 
     # unknown exit code: just the number
     r = pytester.RunResult(99, outlines, errlines, duration=0.5)

Diff for: tox.ini

@@ -11,7 +11,7 @@ envlist =
     py39
     py310
     pypy3
-    py37-{pexpect,xdist,unittestextras,numpy,pluggymaster}
+    py37-{pexpect,xdist,unittestextras,numpy,pluggymain}
     doctesting
     plugins
     py37-freeze
@@ -47,7 +47,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