Merge branch 'release_23.0' into 'release_23.1'

galaxyproject · Apr 11, 2023 · af81541 · af81541
2 parents 3774cc3 + a1bdffa
commit af81541
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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'))"
 

diff --git 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
@@ -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"
 }