Skip to content

Commit 7da6a82

Browse files
authored
Rename master branch to main (#560)
1 parent c2b4f58 commit 7da6a82

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push: # only publishes pushes to the main branch to TestPyPI
77
branches: # any maintenance branch but not tag
88
# avoid generic ** as it duplicates builds from temporary branches
9-
- "master"
9+
- "main"
1010
- "stable/**"
1111
tags-ignore:
1212
- >-
@@ -18,7 +18,7 @@ jobs:
1818
name: Build Docs
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@master
21+
- uses: actions/checkout@v2
2222
- name: Set up Python
2323
uses: actions/setup-python@v3
2424
with:

.github/workflows/release-drafter.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
push:
55
# branches to consider in the event; optional, defaults to all
66
branches:
7-
- master
7+
- main
88
- 'releases/**'
99
- 'stable/**'
1010

1111
jobs:
1212
update_release_draft:
1313
runs-on: ubuntu-latest
1414
steps:
15-
# Drafts your next Release notes as Pull Requests are merged into "master"
15+
# Drafts your next Release notes as Pull Requests are merged into "main"
1616
- uses: release-drafter/release-drafter@v5
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pytest-html
44
pytest-html is a plugin for `pytest <http://pytest.org>`_ that generates a HTML report for test results.
55

66
.. image:: https://img.shields.io/badge/license-MPL%202.0-blue.svg
7-
:target: https://github.com/pytest-dev/pytest-html/blob/master/LICENSE
7+
:target: https://github.com/pytest-dev/pytest-html/blob/main/LICENSE
88
:alt: License
99
.. image:: https://img.shields.io/pypi/v/pytest-html.svg
1010
:target: https://pypi.python.org/pypi/pytest-html/
@@ -16,9 +16,9 @@ pytest-html is a plugin for `pytest <http://pytest.org>`_ that generates a HTML
1616
:target: https://github.com/pytest-dev/pytest-html/actions
1717
:alt: CI
1818
.. image:: https://img.shields.io/requires/github/pytest-dev/pytest-html.svg
19-
:target: https://requires.io/github/pytest-dev/pytest-html/requirements/?branch=master
19+
:target: https://requires.io/github/pytest-dev/pytest-html/requirements/?branch=main
2020
:alt: Requirements
21-
.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/master/graph/badge.svg?token=Y0myNKkdbi
21+
.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/main/graph/badge.svg?token=Y0myNKkdbi
2222
:target: https://codecov.io/gh/pytest-dev/pytest-html
2323
:alt: Codecov
2424

docs/development.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ Releasing a new version
104104

105105
Follow these steps to release a new version of the project:
106106

107-
#. Update your local master with the upstream master (``git pull --rebase upstream master``)
107+
#. Update your local main with the upstream main (``git pull --rebase upstream main``)
108108
#. Create a new branch
109109
#. Update `the changelog`_ with the new version, today's date, and all changes/new features
110110
#. Commit and push the new branch and then create a new pull request
111111
#. Wait for tests and reviews and then merge the branch
112-
#. Once merged, update your local master again (``git pull --rebase upstream master``)
112+
#. Once merged, update your local main again (``git pull --rebase upstream main``)
113113
#. Tag the release with the new release version (``git tag v<new tag>``)
114114
#. Push the tag (``git push upstream --tags``)
115115
#. Done. Check `Github Actions`_ for release progress.

docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. pytest-html documentation master file, created by
1+
.. pytest-html documentation main file, created by
22
sphinx-quickstart on Sun Dec 6 20:48:43 2020.
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ whitelist_externals =
8282
max-line-length = 88
8383
exclude = .eggs,.tox
8484
# rationale here:
85-
# https://github.com/psf/black/blob/master/docs/the_black_code_style.md#slices
85+
# https://black.readthedocs.io/en/stable/the_black_code_style/index.html
8686
extend-ignore = E203
8787

8888
[pytest]

0 commit comments

Comments
 (0)