From ad3ea80e749d86d5c28fa155ca8d6ca6386d3bb7 Mon Sep 17 00:00:00 2001 From: John Davis Date: Wed, 10 Jun 2026 13:30:34 -0400 Subject: [PATCH] Pin galaxy-tool-util-models to current minor version in dependents MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit galaxy-tool-util-models was listed as an unversioned dependency in galaxy-schema, galaxy-tool-util, and galaxy-tool-shed-schema. This caused pip to leave it at a stale version when upgrading an existing virtualenv, because the already-installed version satisfied the loose (unconstrained) requirement. The symptom was ImportError failures at job execution time — e.g.: ImportError: cannot import name 'AnySafeValidatorModel' from 'galaxy.tool_util_models.parameter_validators' — where galaxy-util (at the new version) referenced a symbol that didn't exist in the older galaxy-tool-util-models still present in the venv. Fix: add a >=26.0 lower bound in each dependent package so pip is forced to upgrade galaxy-tool-util-models when installing any of these packages at 26.0 or later. Co-Authored-By: Claude Sonnet 4.6 --- packages/schema/setup.cfg | 2 +- packages/tool_shed_schema/setup.cfg | 2 +- packages/tool_util/setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/schema/setup.cfg b/packages/schema/setup.cfg index e2a207464ad..e49758b1208 100644 --- a/packages/schema/setup.cfg +++ b/packages/schema/setup.cfg @@ -14,7 +14,7 @@ version = 26.0.2.dev0 [options] include_package_data = True install_requires = - galaxy-tool-util-models + galaxy-tool-util-models>=26.0 galaxy-util pydantic[email]>=2.7.4 packages = find: diff --git a/packages/tool_shed_schema/setup.cfg b/packages/tool_shed_schema/setup.cfg index 34992722071..2104f1efbde 100644 --- a/packages/tool_shed_schema/setup.cfg +++ b/packages/tool_shed_schema/setup.cfg @@ -14,7 +14,7 @@ version = 26.0.2.dev0 [options] include_package_data = True install_requires = - galaxy-tool-util-models + galaxy-tool-util-models>=26.0 pydantic>=2.7.4 typing-extensions packages = find: diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg index b1ca68fba60..0264505ee5c 100644 --- a/packages/tool_util/setup.cfg +++ b/packages/tool_util/setup.cfg @@ -14,7 +14,7 @@ version = 26.0.2.dev0 [options] include_package_data = True install_requires = - galaxy-tool-util-models + galaxy-tool-util-models>=26.0 galaxy-util[template,image-util]>=22.1 conda-package-streaming lxml!=4.2.2