From f94e5521ba972fece23965b2cd26a1a69b483d38 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 10 Apr 2023 16:43:15 -0400 Subject: [PATCH 1/5] Fix release script to be compatible with YY.X dates TODO: make this flexible enough to handle 24.X, but we need to discuss the rest of the process --- scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.sh b/scripts/release.sh index d850ffcb80e0..5ef40916881c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -44,7 +44,7 @@ PUSH_BRANCHES=() WORKING_DIR_CLEAN=false ERROR=false -NEXT_RELEASE_TEMPLATE="import datetime; print((datetime.datetime.strptime('RELEASE_CURR', '%y.%m').date() + datetime.timedelta(days=(31 * 4))).strftime('%y.%m'))" +NEXT_RELEASE_TEMPLATE="import packaging.version as pv; v = pv.parse('RELEASE_CURR'); print(str(v.release[0]) + '.' + str(v.release[1] + 1))" PACKAGE_VERSION_TEMPLATE="import packaging.version; print('.'.join(map(str, packaging.version.parse('VERSION').release)))" PACKAGE_DEV_VERSION_TEMPLATE="import packaging.version; print(packaging.version.parse('VERSION'))" From 7279a22c5501d0efeda1a02c3917b1fec1012b13 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 10 Apr 2023 16:55:06 -0400 Subject: [PATCH 2/5] Update release test script --- test/release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/release.sh b/test/release.sh index 1597fe2aa0e4..b1172d764810 100755 --- a/test/release.sh +++ b/test/release.sh @@ -12,9 +12,9 @@ FORK_ROOT=$(mktemp -d -t galaxy_release_test_XXXXXXXX) TEST_RELEASE_PREV= TEST_RELEASE_PREV_MINOR= -TEST_RELEASE_CURR='99.01' -TEST_RELEASE_NEXT='99.05' -TEST_RELEASE_NEXT_NEXT='99.09' +TEST_RELEASE_CURR='99.0' +TEST_RELEASE_NEXT='99.1' +TEST_RELEASE_NEXT_NEXT='99.2' : ${VENV:=${FORK_ROOT}/venv} export VENV From a61dd93049e5ba77d6cca26b5339e60282d7b792 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 11 Apr 2023 07:46:14 -0400 Subject: [PATCH 3/5] Temporarily disable tests that rely on new style version numbers existing for the transition. --- test/release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/release.sh b/test/release.sh index b1172d764810..595f7c462bb5 100755 --- a/test/release.sh +++ b/test/release.sh @@ -304,10 +304,10 @@ function main() { log_function create_venv log_function test_rc log_function test_rc_point - log_function test_initial - log_function test_point - log_function test_next - log_function test_prev + # log_function test_initial + # log_function test_point + # log_function test_next + # log_function test_prev log "OK" } From 95036639dd4f7bd986e93acc99d5dd1be7823286 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 11 Apr 2023 09:10:41 -0400 Subject: [PATCH 4/5] Update version to 23.0. --- lib/galaxy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/version.py b/lib/galaxy/version.py index a922ca03f423..45521d62c1fb 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ VERSION_MAJOR = "23.0" -VERSION_MINOR = "rc1" +VERSION_MINOR = "" VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "") From a1bdffa43f5f23769dc32d33909cc4631aa01ca5 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 11 Apr 2023 09:10:43 -0400 Subject: [PATCH 5/5] Update version to 23.0.1.dev0 --- lib/galaxy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/version.py b/lib/galaxy/version.py index 45521d62c1fb..ca1bc43e7338 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ VERSION_MAJOR = "23.0" -VERSION_MINOR = "" +VERSION_MINOR = "1.dev0" VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "")