diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 57628a34bdf..8c39b66b72b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -164,7 +164,7 @@ Short version #. Fork the repository. #. Enable and install `pre-commit `_ to ensure style-guides and code checks are followed. -#. Target ``master`` for bugfixes and doc changes. +#. Target ``main`` for bugfixes and doc changes. #. Target ``features`` for new features or functionality changes. #. Follow **PEP-8** for naming and `black `_ for formatting. #. Tests are run using ``tox``:: @@ -202,9 +202,9 @@ Here is a simple overview, with pytest-specific bits: $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git $ cd pytest - # now, to fix a bug create your own branch off "master": + # now, to fix a bug create your own branch off "main": - $ git checkout -b your-bugfix-branch-name master + $ git checkout -b your-bugfix-branch-name main # or to instead add a feature create your own branch off "features": @@ -276,7 +276,7 @@ Here is a simple overview, with pytest-specific bits: compare: your-branch-name base-fork: pytest-dev/pytest - base: master # if it's a bugfix + base: main # if it's a bugfix base: features # if it's a feature diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst index b37a245c0be..b3744e2cf61 100644 --- a/HOWTORELEASE.rst +++ b/HOWTORELEASE.rst @@ -1,6 +1,8 @@ Release Procedure ----------------- +TODO: adopt to the bots + Our current policy for releasing is to aim for a bugfix every few weeks and a minor release every 2-3 months. The idea is to get fixes and new features out instead of trying to cram a ton of features into a release and by consequence taking a lot of time to make a new one. @@ -12,9 +14,9 @@ taking a lot of time to make a new one. #. Create a branch ``release-X.Y.Z`` with the version for the release. - * **patch releases**: from the latest ``master``; + * **patch releases**: from the latest ``main``; - * **minor releases**: from the latest ``features``; then merge with the latest ``master``; + * **minor releases**: from the latest ``features``; then merge with the latest ``main``; Ensure your are in a clean work tree. @@ -24,7 +26,7 @@ taking a lot of time to make a new one. This will generate a commit with all the changes ready for pushing. -#. Open a PR for this branch targeting ``master``. +#. Open a PR for this branch targeting ``main``. #. After all tests pass and the PR has been approved, publish to PyPI by pushing the tag:: @@ -33,7 +35,7 @@ taking a lot of time to make a new one. Wait for the deploy to complete, then make sure it is `available on PyPI `_. -#. Merge the PR into ``master``. +#. Merge the PR into ``main``. #. Send an email announcement with the contents from:: diff --git a/README.rst b/README.rst index 69408978703..04c86aac92b 100644 --- a/README.rst +++ b/README.rst @@ -15,14 +15,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://travis-ci.org/pytest-dev/pytest.svg?branch=master +.. image:: https://travis-ci.org/pytest-dev/pytest.svg?branch=main :target: https://travis-ci.org/pytest-dev/pytest -.. image:: https://dev.azure.com/pytest-dev/pytest/_apis/build/status/pytest-CI?branchName=master +.. image:: https://dev.azure.com/pytest-dev/pytest/_apis/build/status/pytest-CI?branchName=main :target: https://dev.azure.com/pytest-dev/pytest .. image:: https://img.shields.io/badge/code%20style-black-000000.svg @@ -131,8 +131,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/azure-pipelines.yml b/azure-pipelines.yml index 5184610fd18..d0d7c588eed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ trigger: -- master +- main - features variables: diff --git a/doc/en/development_guide.rst b/doc/en/development_guide.rst index 649419316d1..f1cafe9b9ca 100644 --- a/doc/en/development_guide.rst +++ b/doc/en/development_guide.rst @@ -19,7 +19,7 @@ Branches We have two long term branches: -* ``master``: contains the code for the next bugfix release. +* ``main``: contains the code for the next bugfix release. * ``features``: contains the code with new features for the next minor release. The official repository usually does not contain topic branches, developers and contributors should create topic diff --git a/doc/en/funcarg_compare.rst b/doc/en/funcarg_compare.rst index 4fa9b79ae7a..12a1113794a 100644 --- a/doc/en/funcarg_compare.rst +++ b/doc/en/funcarg_compare.rst @@ -154,7 +154,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 slave processes. diff --git a/doc/en/index.rst b/doc/en/index.rst index edcbbeb84e7..ff2da09279b 100644 --- a/doc/en/index.rst +++ b/doc/en/index.rst @@ -87,8 +87,8 @@ Consult the :ref:`Changelog ` page for fixes and enhancements of each 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 c6c10bbf358..13765be1595 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/src/_pytest/assertion/__init__.py b/src/_pytest/assertion/__init__.py index 6b6abb863a3..822ce39cc72 100644 --- a/src/_pytest/assertion/__init__.py +++ b/src/_pytest/assertion/__init__.py @@ -94,7 +94,7 @@ def undo(): def pytest_collection(session): # this hook is only called when test modules are collected - # so for example not in the master process of pytest-xdist + # so for example not in the managing process of pytest-xdist # (which does not collect test modules) assertstate = getattr(session.config, "_assertstate", None) if assertstate: diff --git a/testing/test_config.py b/testing/test_config.py index d0e5937303f..5fc076c1554 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -1232,7 +1232,7 @@ def test_config_does_not_load_blocked_plugin_from_args(testdir): ) def test_config_blocked_default_plugins(testdir, plugin): 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 b788020f1c1..74be95869ee 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ envlist = py38 pypy pypy3 - {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymaster} + {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymain} py27-nobyte-xdist doctesting py37-freeze @@ -49,7 +49,7 @@ extras = testing deps = numpy: numpy pexpect: pexpect - pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master + pluggymain: pluggy@git+https://github.com/pytest-dev/pluggy.git twisted: twisted twisted: unittest2 xdist: pytest-xdist>=1.13