Use main branch instead of master

Author: gaborbernat

.github/workflows/check.yml

@@ -145,7 +145,7 @@ jobs:
     - name: build package
       run: python -m pep517.build -s -b . -o dist
     - name: publish to PyPi
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@main
       with:
         skip_existing: true
         user: __token__

README.md

@@ -7,8 +7,8 @@
 [![Gitter Chat](https://img.shields.io/gitter/room/pypa/virtualenv?color=FF004F&style=flat-square)](https://gitter.im/pypa/virtualenv)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/virtualenv?style=flat-square)](https://pypistats.org/packages/virtualenv)
 [![PyPI - License](https://img.shields.io/pypi/l/virtualenv?style=flat-square)](https://opensource.org/licenses/MIT)
-[![Build Status](https://github.com/pypa/virtualenv/workflows/check/badge.svg?branch=master&event=push)](https://github.com/pypa/virtualenv/actions?query=workflow%3Acheck)
-[![codecov](https://codecov.io/gh/pypa/virtualenv/branch/master/graph/badge.svg)](https://codecov.io/gh/pypa/virtualenv)
+[![Build Status](https://github.com/pypa/virtualenv/workflows/check/badge.svg?branch=main&event=push)](https://github.com/pypa/virtualenv/actions?query=workflow%3Acheck)
+[![codecov](https://codecov.io/gh/pypa/virtualenv/branch/main/graph/badge.svg)](https://codecov.io/gh/pypa/virtualenv)
 [![Code style:
 black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
 

docs/conf.py

@@ -24,7 +24,7 @@
 source_suffix = ".rst"
 exclude_patterns = ["_build", "changelog/*", "_draft.rst"]
 
-master_doc = "index"
+main_doc = "index"
 pygments_style = "default"
 always_document_param_types = True
 project = name

docs/development.rst

@@ -116,7 +116,7 @@ Contributing
 Submitting pull requests
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Submit pull requests against the ``master`` branch, providing a good description of what you're doing and why. You must
+Submit pull requests against the ``main`` branch, providing a good description of what you're doing and why. You must
 have legal permission to distribute any code you contribute to virtualenv and it must be available under the MIT
 License. Provide tests that cover your changes and run the tests locally first. virtualenv
 :ref:`supports <compatibility-requirements>` multiple Python versions and operating systems. Any pull request must
@@ -135,7 +135,7 @@ or whitespace within lines. Such changes can be made separately, as a "formattin
 Automated testing
 ~~~~~~~~~~~~~~~~~
 
-All pull requests and merges to 'master' branch are tested using
+All pull requests and merges to 'main' branch are tested using
 `Azure Pipelines <https://azure.microsoft.com/en-gb/services/devops/pipelines/>`_ (configured by
 ``azure-pipelines.yml`` file at the root of the repository). You can find the status and results to the CI runs for your
 PR on GitHub's Web UI for the pull request. You can also find links to the CI services' pages for the specific builds in

docs/installation.rst

@@ -41,7 +41,7 @@ sdist
 When installing via a source distribution you need an installer that handles the
 `PEP-517 <https://www.python.org/dev/peps/pep-0517/>`_ specification. In case of ``pip`` this is version ``18.0.0`` or
 later (released on 2018 July). If you cannot upgrade your pip to support this you need to ensure that the build
-requirements from `pyproject.toml <https://github.com/pypa/virtualenv/blob/master/pyproject.toml#L2>`_ are satisfied
+requirements from `pyproject.toml <https://github.com/pypa/virtualenv/blob/main/pyproject.toml#L2>`_ are satisfied
 before triggering the install.
 
 via zipapp
@@ -76,7 +76,7 @@ a pip version of at least ``18.0.0`` and use the following command:
 
 .. code-block:: console
 
-    pip install git+https://github.com/pypa/virtualenv.git@master
+    pip install git+https://github.com/pypa/virtualenv.git@main
 
 .. _compatibility-requirements:
 

docs/user_guide.rst

@@ -184,13 +184,13 @@ Embed wheels for distributions
 Custom distributions often want to use their own set of wheel versions to distribute instead of the one virtualenv
 releases on PyPi. The reason for this is trying to keep the system versions of those package in sync with what
 virtualenv uses. In such cases they should patch the module `virtualenv.seed.wheels.embed
-<https://github.com/pypa/virtualenv/tree/master/src/virtualenv/seed/wheels/embed>`_, making sure to provide the function
+<https://github.com/pypa/virtualenv/tree/main/src/virtualenv/seed/wheels/embed>`_, making sure to provide the function
 ``get_embed_wheel`` (which returns the wheel to use given a distribution/python version). The ``BUNDLE_FOLDER``,
 ``BUNDLE_SUPPORT`` and ``MAX`` variables are needed if they want to use virtualenvs test suite to validate.
 
 Furthermore, they might want to disable the periodic update by patching the
 `virtualenv.seed.embed.base_embed.PERIODIC_UPDATE_ON_BY_DEFAULT
-<https://github.com/pypa/virtualenv/tree/master/src/virtualenv/seed/embed/base_embed.py>`_
+<https://github.com/pypa/virtualenv/tree/main/src/virtualenv/seed/embed/base_embed.py>`_
 to ``False``, and letting the system update mechanism to handle this. Note in this case the user might still request an
 upgrade of the embedded wheels by invoking virtualenv via :option:`upgrade-embed-wheels`, but no longer happens
 automatically, and will not alter the OS provided wheels.

src/virtualenv/discovery/py_info.py

@@ -120,7 +120,7 @@ def _fast_get_system_executable(self):
 
     @staticmethod
     def _distutils_install():
-        # follow https://github.com/pypa/pip/blob/master/src/pip/_internal/locations.py#L95
+        # follow https://github.com/pypa/pip/blob/main/src/pip/_internal/locations.py#L95
         # note here we don't import Distribution directly to allow setuptools to patch it
         d = dist.Distribution({"script_args": "--no-user-cfg"})  # conf files not parsed so they do not hijack paths
         if hasattr(sys, "_framework"):

tasks/release.py

@@ -27,11 +27,11 @@ def main(version_str: str) -> None:
 
 
 def create_release_branch(repo: Repo, version: Version) -> Tuple[Remote, Head]:
-    print("create release branch from upstream master")
+    print("create release branch from upstream main")
     upstream = get_upstream(repo)
     upstream.fetch()
     branch_name = f"release-{version}"
-    release_branch = repo.create_head(branch_name, upstream.refs.master, force=True)
+    release_branch = repo.create_head(branch_name, upstream.refs.main, force=True)
     upstream.push(refspec=f"{branch_name}:{branch_name}", force=True)
     release_branch.set_tracking_branch(repo.refs[f"{upstream.name}/{branch_name}"])
     release_branch.checkout()

tox.ini

@@ -41,7 +41,7 @@ commands =
 
 [testenv:coverage]
 description = [run locally after tests]: combine coverage data and create report;
-              generates a diff coverage against origin/master (can be changed by setting DIFF_AGAINST env var)
+              generates a diff coverage against origin/main (can be changed by setting DIFF_AGAINST env var)
 deps =
     coverage >= 5.0.1
     diff_cover >= 3
@@ -55,7 +55,7 @@ commands =
     python -m coverage report --skip-covered --show-missing
     python -m coverage xml -o {toxworkdir}/coverage.xml
     python -m coverage html -d {toxworkdir}/htmlcov
-    python -m diff_cover.diff_cover_tool --compare-branch {env:DIFF_AGAINST:origin/master} {toxworkdir}/coverage.xml
+    python -m diff_cover.diff_cover_tool --compare-branch {env:DIFF_AGAINST:origin/main} {toxworkdir}/coverage.xml
 depends =
     py38
     py37