Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Rename master branch to main" #562

Merged
merged 1 commit into from Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Expand Up @@ -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
- "main"
- "master"
- "stable/**"
tags-ignore:
- >-
Expand All @@ -18,7 +18,7 @@ jobs:
name: Build Docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@master
- name: Set up Python
uses: actions/setup-python@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Expand Up @@ -4,15 +4,15 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- main
- master
- 'releases/**'
- 'stable/**'

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions README.rst
Expand Up @@ -4,7 +4,7 @@ pytest-html
pytest-html is a plugin for `pytest <http://pytest.org>`_ 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/main/LICENSE
:target: https://github.com/pytest-dev/pytest-html/blob/master/LICENSE
:alt: License
.. image:: https://img.shields.io/pypi/v/pytest-html.svg
:target: https://pypi.python.org/pypi/pytest-html/
Expand All @@ -16,9 +16,9 @@ pytest-html is a plugin for `pytest <http://pytest.org>`_ 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=main
:target: https://requires.io/github/pytest-dev/pytest-html/requirements/?branch=master
:alt: Requirements
.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/main/graph/badge.svg?token=Y0myNKkdbi
.. image:: https://codecov.io/gh/pytest-dev/pytest-html/branch/master/graph/badge.svg?token=Y0myNKkdbi
:target: https://codecov.io/gh/pytest-dev/pytest-html
:alt: Codecov

Expand Down
4 changes: 2 additions & 2 deletions docs/development.rst
Expand Up @@ -104,12 +104,12 @@ Releasing a new version

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

#. Update your local main with the upstream main (``git pull --rebase upstream main``)
#. Update your local master with the upstream master (``git pull --rebase upstream master``)
#. 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 main again (``git pull --rebase upstream main``)
#. Once merged, update your local master again (``git pull --rebase upstream master``)
#. Tag the release with the new release version (``git tag v<new tag>``)
#. Push the tag (``git push upstream --tags``)
#. Done. Check `Github Actions`_ for release progress.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
@@ -1,4 +1,4 @@
.. pytest-html documentation main file, created by
.. pytest-html documentation master 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.
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -82,7 +82,7 @@ whitelist_externals =
max-line-length = 88
exclude = .eggs,.tox
# rationale here:
# https://black.readthedocs.io/en/stable/the_black_code_style/index.html
# https://github.com/psf/black/blob/master/docs/the_black_code_style.md#slices
extend-ignore = E203

[pytest]
Expand Down