diff options
| author | Gael Pasgrimaud <gael@gawel.org> | 2023-01-03 09:10:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 09:10:16 +0100 |
| commit | 75700f4417e55f465d7d4a5bff8b074c2b60da51 (patch) | |
| tree | 38413250ff133bc39ee5bf6c7ab7ad1b7f9caedb | |
| parent | 864ede2cbc26b9c74ddc4ca3351d65681c0fb33e (diff) | |
| parent | e20233e15da671fca58b66a5a4bc4557b912a1f2 (diff) | |
| download | webtest-75700f4417e55f465d7d4a5bff8b074c2b60da51.tar.gz | |
Merge pull request #247 from jvanasco/main
rename "master" to "main"
| -rw-r--r-- | .github/workflows/ci-tests.yml | 4 | ||||
| -rw-r--r-- | CHANGELOG.rst | 1 | ||||
| -rw-r--r-- | contributing.md | 4 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/index.rst | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 38f34e7..4e5ec07 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,10 +1,10 @@ name: Build and test on: - # Build on pushes to master + # Build on pushes to main push: branches: - - master + - main tags: # Build pull requests pull_request: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c2e06f8..ef70398 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ News ------------------ - Multiple file input support. +- Rename "master" git branch to "main". 3.0.0 (2021-08-19) diff --git a/contributing.md b/contributing.md index d0be760..f57a051 100644 --- a/contributing.md +++ b/contributing.md @@ -14,8 +14,8 @@ You can contribute to this project in several ways. Git branches and their purpose and status at the time of this writing are listed below. -* [master](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub. -* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the master branch and deployed. +* [main](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub. +* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the main branch and deployed. ## Prerequisites diff --git a/docs/conf.py b/docs/conf.py index 96746bf..cab66ed 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,7 +48,7 @@ source_suffix = '.rst' # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. +# The main toctree document. master_doc = 'index' # General information about the project. diff --git a/docs/index.rst b/docs/index.rst index 42fddf0..f0d5544 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -34,7 +34,7 @@ Or if you want the development version: .. code-block:: sh - $ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/master + $ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/main What This Does ============== |