File tree 6 files changed +11
-11
lines changed
6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 6
6
push : # only publishes pushes to the main branch to TestPyPI
7
7
branches : # any maintenance branch but not tag
8
8
# avoid generic ** as it duplicates builds from temporary branches
9
- - " master "
9
+ - " main "
10
10
- " stable/**"
11
11
tags-ignore :
12
12
- >-
18
18
name : Build Docs
19
19
runs-on : ubuntu-latest
20
20
steps :
21
- - uses : actions/checkout@master
21
+ - uses : actions/checkout@v2
22
22
- name : Set up Python
23
23
uses : actions/setup-python@v3
24
24
with :
Original file line number Diff line number Diff line change 4
4
push :
5
5
# branches to consider in the event; optional, defaults to all
6
6
branches :
7
- - master
7
+ - main
8
8
- ' releases/**'
9
9
- ' stable/**'
10
10
11
11
jobs :
12
12
update_release_draft :
13
13
runs-on : ubuntu-latest
14
14
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 "
16
16
- uses : release-drafter/release-drafter@v5
17
17
env :
18
18
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ pytest-html
4
4
pytest-html is a plugin for `pytest <http://pytest.org >`_ that generates a HTML report for test results.
5
5
6
6
.. 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
8
8
:alt: License
9
9
.. image :: https://img.shields.io/pypi/v/pytest-html.svg
10
10
: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
16
16
:target: https://github.com/pytest-dev/pytest-html/actions
17
17
:alt: CI
18
18
.. 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
20
20
: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
22
22
:target: https://codecov.io/gh/pytest-dev/pytest-html
23
23
:alt: Codecov
24
24
Original file line number Diff line number Diff line change @@ -104,12 +104,12 @@ Releasing a new version
104
104
105
105
Follow these steps to release a new version of the project:
106
106
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 ``)
108
108
#. Create a new branch
109
109
#. Update `the changelog `_ with the new version, today's date, and all changes/new features
110
110
#. Commit and push the new branch and then create a new pull request
111
111
#. 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 ``)
113
113
#. Tag the release with the new release version (``git tag v<new tag> ``)
114
114
#. Push the tag (``git push upstream --tags ``)
115
115
#. Done. Check `Github Actions `_ for release progress.
Original file line number Diff line number Diff line change 1
- .. pytest-html documentation master file, created by
1
+ .. pytest-html documentation main file, created by
2
2
sphinx-quickstart on Sun Dec 6 20:48:43 2020.
3
3
You can adapt this file completely to your liking, but it should at least
4
4
contain the root `toctree` directive.
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ whitelist_externals =
82
82
max-line-length = 88
83
83
exclude = .eggs,.tox
84
84
# 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
86
86
extend-ignore = E203
87
87
88
88
[pytest]
You can’t perform that action at this time.
0 commit comments