From 13b6ed44d8eba5d6814df183ca6aaa1fc59dc7c9 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 13 Feb 2024 16:38:09 +0100 Subject: [PATCH 1/4] Update release process documentation --- ...reate_point_release.rst => create_release.rst} | 15 +++++++++++++-- doc/source/dev/index.rst | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) rename doc/source/dev/{create_point_release.rst => create_release.rst} (78%) diff --git a/doc/source/dev/create_point_release.rst b/doc/source/dev/create_release.rst similarity index 78% rename from doc/source/dev/create_point_release.rst rename to doc/source/dev/create_release.rst index 6c254971a8a6..dc9ac433d614 100644 --- a/doc/source/dev/create_point_release.rst +++ b/doc/source/dev/create_release.rst @@ -1,3 +1,14 @@ +Creating Galaxy Releases +======================== + +The "main" release process is an interactive checklist with instructions (see `Publication of Galaxy Release v 23.2 https://github.com/galaxyproject/galaxy/issues/16742>`_ for an example). +This issue is generated via `make release-issue` at the end of the process. +The final result of the release process are +- a new branch (release_YY.N) from which point releases are created +- a tag pointing at the first commit of the branch (vYY.N) + +Python packages are not uploaded by this process, but are instead created by creating a point release, where the first point release should be `vYY.N.0`. + Creating Galaxy Point Releases ============================== @@ -10,7 +21,7 @@ The command is shipped with the `galaxy-release-util `_ you can create a new pre-release associated with the newly created tag. The pre-release event will trigger a github workflow that uploads packages to the `test PyPI instance `_. -If this all looks good you can promote the pre-release to a release and that will trigger the upload to the `main PyPI instance `_. \ No newline at end of file +If this all looks good you can promote the pre-release to a release and that will trigger the upload to the `main PyPI instance `_. diff --git a/doc/source/dev/index.rst b/doc/source/dev/index.rst index 7d05a9d72ddf..0957dfc5aeec 100644 --- a/doc/source/dev/index.rst +++ b/doc/source/dev/index.rst @@ -24,4 +24,4 @@ A multi-hour long video playlist covering these slides can be found at debugging_galaxy debugging_galaxy_slurm translating - create_point_release + create_release From f20c4991547dd432985df9f1ac10c64599b32608 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 13 Feb 2024 17:06:21 +0100 Subject: [PATCH 2/4] Maybe change the initial 1.dev0 version to 0.dev0 ? --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index 5ef40916881c..a76596eb9f46 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -397,7 +397,7 @@ function increment_minor() { [ "$RELEASE_TYPE" != 'rc' ] || { log_error "Cannot create rc after release (current version: ${RELEASE_CURR}.0)"; exit 1; } - echo '1.dev0' + echo '0.dev0' ;; *) log_error "Don't know how to increment minor version: ${minor}" From ee9396971dd54b007728040e71fff384e7529e7e Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Tue, 13 Feb 2024 17:58:47 +0100 Subject: [PATCH 3/4] Simplify explanations Co-authored-by: John Davis --- doc/source/dev/create_release.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst index dc9ac433d614..a5582c36817b 100644 --- a/doc/source/dev/create_release.rst +++ b/doc/source/dev/create_release.rst @@ -2,12 +2,12 @@ Creating Galaxy Releases ======================== The "main" release process is an interactive checklist with instructions (see `Publication of Galaxy Release v 23.2 https://github.com/galaxyproject/galaxy/issues/16742>`_ for an example). -This issue is generated via `make release-issue` at the end of the process. +This issue is generated via `make release-issue`. The final result of the release process are - a new branch (release_YY.N) from which point releases are created - a tag pointing at the first commit of the branch (vYY.N) -Python packages are not uploaded by this process, but are instead created by creating a point release, where the first point release should be `vYY.N.0`. +Python packages are not published by this process, but are instead published by creating point releases where the first point release should be `vYY.N.0`. Creating Galaxy Point Releases ============================== From 799d27f0e50d37b44475b4652b5a45d188de5506 Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Tue, 13 Feb 2024 19:19:23 +0100 Subject: [PATCH 4/4] Fix rst list syntax Co-authored-by: John Davis --- doc/source/dev/create_release.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/dev/create_release.rst b/doc/source/dev/create_release.rst index a5582c36817b..59e0cb96ac15 100644 --- a/doc/source/dev/create_release.rst +++ b/doc/source/dev/create_release.rst @@ -4,6 +4,7 @@ Creating Galaxy Releases The "main" release process is an interactive checklist with instructions (see `Publication of Galaxy Release v 23.2 https://github.com/galaxyproject/galaxy/issues/16742>`_ for an example). This issue is generated via `make release-issue`. The final result of the release process are + - a new branch (release_YY.N) from which point releases are created - a tag pointing at the first commit of the branch (vYY.N)