diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 38a53000..62695b49 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -6,7 +6,7 @@ on: push: # only publishes pushes to the main branch to TestPyPI branches: # any maintenance branch but not tag # avoid generic ** as it duplicates builds from temporary branches - - "master" + - "main" - "stable/**" tags-ignore: - >- @@ -18,7 +18,7 @@ jobs: name: Build Docs runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v3 with: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 7d3004ad..af12e908 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,7 +4,7 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main - 'releases/**' - 'stable/**' @@ -12,7 +12,7 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - # Drafts your next Release notes as Pull Requests are merged into "master" + # Drafts your next Release notes as Pull Requests are merged into "main" - uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.rst b/README.rst index 7cf04078..2c72ea1a 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ pytest-html pytest-html is a plugin for `pytest `_ that generates a HTML report for test results. .. image:: https://img.shields.io/badge/license-MPL%202.0-blue.svg - :target: https://github.com/pytest-dev/pytest-html/blob/master/LICENSE + :target: https://github.com/pytest-dev/pytest-html/blob/main/LICENSE :alt: License .. image:: https://img.shields.io/pypi/v/pytest-html.svg :target: https://pypi.python.org/pypi/pytest-html/ @@ -16,9 +16,9 @@ pytest-html is a plugin for `pytest `_ that generates a HTML :target: https://github.com/pytest-dev/pytest-html/actions :alt: CI .. image:: https://img.shields.io/requires/github/pytest-dev/pytest-html.svg - :target: https://requires.io/github/pytest-dev/pytest-html/requirements/?branch=master + :target: https://requires.io/github/pytest-dev/pytest-html/requirements/?branch=main :alt: Requirements -.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/master/graph/badge.svg?token=Y0myNKkdbi +.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/main/graph/badge.svg?token=Y0myNKkdbi :target: https://codecov.io/gh/pytest-dev/pytest-html :alt: Codecov diff --git a/docs/development.rst b/docs/development.rst index 8e0220e1..65add397 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -104,12 +104,12 @@ Releasing a new version Follow these steps to release a new version of the project: -#. Update your local master with the upstream master (``git pull --rebase upstream master``) +#. Update your local main with the upstream main (``git pull --rebase upstream main``) #. Create a new branch #. Update `the changelog`_ with the new version, today's date, and all changes/new features #. Commit and push the new branch and then create a new pull request #. Wait for tests and reviews and then merge the branch -#. Once merged, update your local master again (``git pull --rebase upstream master``) +#. Once merged, update your local main again (``git pull --rebase upstream main``) #. Tag the release with the new release version (``git tag v``) #. Push the tag (``git push upstream --tags``) #. Done. Check `Github Actions`_ for release progress. diff --git a/docs/index.rst b/docs/index.rst index fde8d81b..fbb70ca2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,4 @@ -.. pytest-html documentation master file, created by +.. pytest-html documentation main file, created by sphinx-quickstart on Sun Dec 6 20:48:43 2020. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. diff --git a/tox.ini b/tox.ini index 9b279358..82ca1307 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,7 @@ whitelist_externals = max-line-length = 88 exclude = .eggs,.tox # rationale here: -# https://github.com/psf/black/blob/master/docs/the_black_code_style.md#slices +# https://black.readthedocs.io/en/stable/the_black_code_style/index.html extend-ignore = E203 [pytest]