From a29d0ede329b9f3050350af3373db3747049da40 Mon Sep 17 00:00:00 2001 From: Ahmed Awan Date: Tue, 7 Oct 2025 11:53:50 -0500 Subject: [PATCH 1/4] Update version to 25.1.rc1 --- 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 f26f6306727..b728bccdff6 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ VERSION_MAJOR = "25.1" -VERSION_MINOR = "dev0" +VERSION_MINOR = "rc1" VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "") From 92bb702c9525297651d61c65146e36f2b0a74826 Mon Sep 17 00:00:00 2001 From: Ahmed Awan Date: Tue, 7 Oct 2025 11:53:51 -0500 Subject: [PATCH 2/4] Update version to 25.2.dev0 --- Makefile | 2 +- lib/galaxy/version.py | 2 +- packages/web_client/galaxy/web_client/client_build_hash.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 packages/web_client/galaxy/web_client/client_build_hash.txt diff --git a/Makefile b/Makefile index 72f32693e3b..e7dd280a77c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VENV?=.venv # Source virtualenv to execute command (darker, sphinx, twine, etc...) IN_VENV=if [ -f "$(VENV)/bin/activate" ]; then . "$(VENV)/bin/activate"; fi; -RELEASE_CURR:=25.1 +RELEASE_CURR:=25.2 RELEASE_UPSTREAM:=upstream CONFIG_MANAGE=$(IN_VENV) python lib/galaxy/config/config_manage.py PROJECT_URL?=https://github.com/galaxyproject/galaxy diff --git a/lib/galaxy/version.py b/lib/galaxy/version.py index f26f6306727..93d4cfbbebc 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ -VERSION_MAJOR = "25.1" +VERSION_MAJOR = "25.2" VERSION_MINOR = "dev0" VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "") diff --git a/packages/web_client/galaxy/web_client/client_build_hash.txt b/packages/web_client/galaxy/web_client/client_build_hash.txt new file mode 100644 index 00000000000..d3dcd75698b --- /dev/null +++ b/packages/web_client/galaxy/web_client/client_build_hash.txt @@ -0,0 +1 @@ +6d82d99bb520289dab34db1f3bd575664374273a From ef1f484de8d802f5577f55e715c2bbc2af230ce7 Mon Sep 17 00:00:00 2001 From: Ahmed Awan Date: Tue, 7 Oct 2025 12:02:17 -0500 Subject: [PATCH 3/4] fix version 25.2 to 26.0 The `make release-create-rc` command expects there to be a .2 version after a .1 version, but that is not always the case (for 25.1 -> 26.0 for e.g.). --- Makefile | 2 +- lib/galaxy/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e7dd280a77c..51eb26656f6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VENV?=.venv # Source virtualenv to execute command (darker, sphinx, twine, etc...) IN_VENV=if [ -f "$(VENV)/bin/activate" ]; then . "$(VENV)/bin/activate"; fi; -RELEASE_CURR:=25.2 +RELEASE_CURR:=26.0 RELEASE_UPSTREAM:=upstream CONFIG_MANAGE=$(IN_VENV) python lib/galaxy/config/config_manage.py PROJECT_URL?=https://github.com/galaxyproject/galaxy diff --git a/lib/galaxy/version.py b/lib/galaxy/version.py index 93d4cfbbebc..760f6a0a3e3 100644 --- a/lib/galaxy/version.py +++ b/lib/galaxy/version.py @@ -1,3 +1,3 @@ -VERSION_MAJOR = "25.2" +VERSION_MAJOR = "26.0" VERSION_MINOR = "dev0" VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "") From 527b1c3293c7ace2655509b1ad75ee93ba088d84 Mon Sep 17 00:00:00 2001 From: Ahmed Awan Date: Tue, 7 Oct 2025 12:04:07 -0500 Subject: [PATCH 4/4] remove --- packages/web_client/galaxy/web_client/client_build_hash.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packages/web_client/galaxy/web_client/client_build_hash.txt diff --git a/packages/web_client/galaxy/web_client/client_build_hash.txt b/packages/web_client/galaxy/web_client/client_build_hash.txt deleted file mode 100644 index d3dcd75698b..00000000000 --- a/packages/web_client/galaxy/web_client/client_build_hash.txt +++ /dev/null @@ -1 +0,0 @@ -6d82d99bb520289dab34db1f3bd575664374273a