diff options
| author | jonathan vanasco <jonathan@2xlp.com> | 2022-11-14 15:27:33 -0500 |
|---|---|---|
| committer | jonathan vanasco <jonathan@2xlp.com> | 2022-11-14 15:27:33 -0500 |
| commit | b7aecfe6aaff9ea50f657ae2d6638e33addc07c6 (patch) | |
| tree | 1133f98211fa06c747b6524b2e5e627646017d90 /RELEASING.txt | |
| parent | 51a731c690b2644df206722767a74fee9339fb87 (diff) | |
| download | pyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.tar.gz pyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.tar.bz2 pyramid-b7aecfe6aaff9ea50f657ae2d6638e33addc07c6.zip | |
rename "master" to "main"
Diffstat (limited to 'RELEASING.txt')
| -rw-r--r-- | RELEASING.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/RELEASING.txt b/RELEASING.txt index 9cf8a1090..1450f2043 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -19,7 +19,7 @@ Prepare new release branch - Create a new release branch, incrementing the version number. -- Do any necessary branch merges (e.g., master to branch, branch to master). +- Do any necessary branch merges (e.g., main to branch, branch to main). - On release branch: @@ -33,7 +33,7 @@ Prepare new release branch - Run tests on Windows if feasible. -- For each ``pyramid-cookiecutter-*``, make a new branch off "master" with the +- For each ``pyramid-cookiecutter-*``, make a new branch off "main" with the same name to align with the new Pyramid release branch name. - In the docs, update the ``cookiecutter`` command with the new branch name, @@ -60,7 +60,7 @@ Prepare new release branch - For major version releases, in contributing.md, update branch descriptions. - For major version releases, in docs/conf.py, update values under - html_theme_options for in_progress and outdated across master, releasing + html_theme_options for in_progress and outdated across main, releasing branch, and previously released branch. Also in the previously released branch only, uncomment the sections to enable pylons_sphinx_latesturl. @@ -84,10 +84,10 @@ Prepare new release branch - Configure RTD to publish the new release version of the docs. -Prepare master for further development (major releases only) +Prepare "main" for further development (major releases only) ------------------------------------------------------------ -- Checkout master. +- Checkout "main". - In CHANGES.rst, preserve headings but clear out content. Add heading "unreleased" for the version number. @@ -103,11 +103,11 @@ Prepare master for further development (major releases only) - Change setup.py version to the next version number. - Update README.rst to use correct versions of badges, URLs, and ALT option - for "master" instead of the major release version. + for "main" instead of the major release version. -- In the docs, update the ``cookiecutter`` command with ``master``, +- In the docs, update the ``cookiecutter`` command with ``main``, for example, ``cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout - master``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` + main``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` should return all instances to be updated. Update previous version (final releases only) |