From 7dbc4a7a4b480365461ce882670070c932b3fcd9 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 1 Jun 2017 11:41:41 -0700 Subject: clarify badges for releasing --- RELEASING.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'RELEASING.txt') diff --git a/RELEASING.txt b/RELEASING.txt index 58ebb2fb3..24bbb3e77 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -48,8 +48,8 @@ Prepare new release branch include a link under "Bug Fix Releases" to the minor feature changes in CHANGES.txt. -- Update README.rst to use correct versions of badges and URLs according to - each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch". +- Update README.rst to use correct versions of badges, URLs, and ALT option + according to each branch and context. - Update whatsnew-X.X.rst in docs to point at change log entries for individual releases if applicable. -- cgit v1.2.3 From 93c94e102f5b6d732fb06ca8d18383154e2c9636 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 1 Jun 2017 12:11:58 -0700 Subject: use the version for the mid-release cycle - update releasing.txt accordingly --- RELEASING.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'RELEASING.txt') diff --git a/RELEASING.txt b/RELEASING.txt index 24bbb3e77..f780a607b 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -49,7 +49,7 @@ Prepare new release branch changes in CHANGES.txt. - Update README.rst to use correct versions of badges, URLs, and ALT option - according to each branch and context. + according to the new release branch name. - Update whatsnew-X.X.rst in docs to point at change log entries for individual releases if applicable. @@ -96,6 +96,9 @@ 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. + Update previous version (final releases only) --------------------------------------------- -- cgit v1.2.3 From d179ce929d800fb5a8a43e9fece625cdd2eba25f Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 1 Jun 2017 18:10:25 -0700 Subject: use shortcut for github URL; update RELEASING.txt - refs: #3042 --- RELEASING.txt | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'RELEASING.txt') diff --git a/RELEASING.txt b/RELEASING.txt index f780a607b..cb619dc8d 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -38,6 +38,9 @@ Prepare new release branch $ ./scaffoldtests.sh +- For each ``pyramid-cookiecutter-*``, make a new branch off "master" with the + same name to align with the new Pyramid release branch name. + - Ensure all features of the release are documented (audit CHANGES.txt or communicate with contributors). @@ -102,6 +105,11 @@ Prepare master for further development (major releases only) Update previous version (final releases only) --------------------------------------------- +- In the docs, update the ``cookiecutter`` command by appending the previous + branch name for checkout, for example, ``cookiecutter + gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch``. A search for + ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` should return all instances. + - In docs/conf.py, update values under html_theme_options for in_progress and outdated. Uncomment the sections to enable pylons_sphinx_latesturl. -- cgit v1.2.3 From 64cf0e5f9e4f4f56a377bd33202c2232c14e2eaf Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 2 Jun 2017 12:54:32 -0700 Subject: Move docs update to Prepare new release branch --- RELEASING.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'RELEASING.txt') diff --git a/RELEASING.txt b/RELEASING.txt index cb619dc8d..29d999522 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -41,6 +41,11 @@ Prepare new release branch - For each ``pyramid-cookiecutter-*``, make a new branch off "master" 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, + for example, ``cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout + x.y-branch``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` + should return all instances to be updated. + - Ensure all features of the release are documented (audit CHANGES.txt or communicate with contributors). @@ -105,11 +110,6 @@ Prepare master for further development (major releases only) Update previous version (final releases only) --------------------------------------------- -- In the docs, update the ``cookiecutter`` command by appending the previous - branch name for checkout, for example, ``cookiecutter - gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch``. A search for - ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` should return all instances. - - In docs/conf.py, update values under html_theme_options for in_progress and outdated. Uncomment the sections to enable pylons_sphinx_latesturl. -- cgit v1.2.3 From cb3b05f43fd297fc8e3556cb8c9d59017229e519 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 2 Jun 2017 13:15:57 -0700 Subject: Add cookiecutter step for master branch upon release of new branch --- RELEASING.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'RELEASING.txt') diff --git a/RELEASING.txt b/RELEASING.txt index 29d999522..9f7db457e 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -107,6 +107,11 @@ Prepare master for further development (major releases only) - Update README.rst to use correct versions of badges, URLs, and ALT option for "master" instead of the major release version. +- In the docs, update the ``cookiecutter`` command with ``master``, + for example, ``cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout + master``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-`` + should return all instances to be updated. + Update previous version (final releases only) --------------------------------------------- -- cgit v1.2.3