From 26009807a2ddbd012c74e23583040a1577adaa41 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Sat, 11 Jul 2026 15:47:32 +0100 Subject: [PATCH] Make cloudbridge a conditional/test requirement It's not used by pre-installed tools any more, just for the cloud object store. --- lib/galaxy/dependencies/__init__.py | 3 +++ lib/galaxy/dependencies/conditional-requirements.txt | 3 +++ lib/galaxy/dependencies/dev-requirements.txt | 3 +++ lib/galaxy/dependencies/pinned-requirements.txt | 2 -- lib/galaxy/dependencies/pinned-test-requirements.txt | 3 +++ pyproject.toml | 2 +- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py index 99c72662cce..d54bef0b738 100644 --- a/lib/galaxy/dependencies/__init__.py +++ b/lib/galaxy/dependencies/__init__.py @@ -254,6 +254,9 @@ class ConditionalDependencies: def check_boto3(self): return "boto3" in self.object_stores + def check_cloudbridge(self): + return "cloud" in self.object_stores + def check_kamaki(self): return "pithos" in self.object_stores diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt index e1a5ef8577c..0ffc4793c36 100644 --- a/lib/galaxy/dependencies/conditional-requirements.txt +++ b/lib/galaxy/dependencies/conditional-requirements.txt @@ -46,6 +46,9 @@ chronos-python==1.2.1 # Kubernetes job runner pykube-ng==23.6.0 +# Cloud object store +cloudbridge + # Synnefo / Pithos+ object store client kamaki diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt index 2f5c8a7ff02..07c09d3f29a 100644 --- a/lib/galaxy/dependencies/dev-requirements.txt +++ b/lib/galaxy/dependencies/dev-requirements.txt @@ -26,6 +26,7 @@ certifi==2026.6.17 cffi==2.1.0 ; (implementation_name != 'pypy' and os_name == 'nt') or platform_python_implementation != 'PyPy' charset-normalizer==3.4.9 click==8.4.2 +cloudbridge==4.3.0 codespell==2.4.2 colorama==0.4.6 ; os_name == 'nt' or sys_platform == 'win32' colorlog==6.10.1 @@ -137,6 +138,7 @@ pycparser==3.0 ; (implementation_name != 'PyPy' and implementation_name != 'pypy pydantic==2.13.4 pydantic-core==2.46.4 pyee==13.0.1 +pyeventsystem==0.1.0 pygithub==2.9.1 pygments==2.20.0 pyjwt==2.13.0 @@ -208,6 +210,7 @@ statsd==4.0.1 stevedore==5.8.0 ; python_full_version < '3.11' stevedore==5.9.0 ; python_full_version >= '3.11' tabulate==0.10.0 +tenacity==9.1.4 testfixtures==8.3.0 ; python_full_version < '3.11' testfixtures==12.3.0 ; python_full_version >= '3.11' text-unidecode==1.3 diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 844cd97e921..1a33bda1613 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -52,7 +52,6 @@ click-didyoumean==0.3.1 click-plugins==1.1.1.2 click-repl==0.3.0 cloudauthz==0.6.0 -cloudbridge==4.3.0 colorama==0.4.6 ; sys_platform == 'win32' coloredlogs==15.0.1 conda-package-streaming==0.13.0 @@ -204,7 +203,6 @@ pydantic-settings==2.14.2 pydantic-tes==0.4.0 pydicom==3.0.2 pydot==4.0.1 -pyeventsystem==0.1.0 pyfaidx==0.9.0.4 pygments==2.20.0 pyjwt==2.13.0 diff --git a/lib/galaxy/dependencies/pinned-test-requirements.txt b/lib/galaxy/dependencies/pinned-test-requirements.txt index ff18f95965a..327e7178680 100644 --- a/lib/galaxy/dependencies/pinned-test-requirements.txt +++ b/lib/galaxy/dependencies/pinned-test-requirements.txt @@ -21,6 +21,7 @@ certifi==2026.6.17 cffi==2.1.0 ; (implementation_name != 'pypy' and os_name == 'nt') or platform_python_implementation != 'PyPy' charset-normalizer==3.4.9 click==8.4.2 +cloudbridge==4.3.0 colorama==0.4.6 ; sys_platform == 'win32' colorlog==6.10.1 contourpy==1.3.2 ; python_full_version < '3.11' @@ -112,6 +113,7 @@ pycparser==3.0 ; (implementation_name != 'PyPy' and implementation_name != 'pypy pydantic==2.13.4 pydantic-core==2.46.4 pyee==13.0.1 +pyeventsystem==0.1.0 pygments==2.20.0 pyparsing==3.3.2 pyshacl==0.40.0 @@ -160,6 +162,7 @@ statsd==4.0.1 stevedore==5.8.0 ; python_full_version < '3.11' stevedore==5.9.0 ; python_full_version >= '3.11' tabulate==0.10.0 +tenacity==9.1.4 testfixtures==8.3.0 ; python_full_version < '3.11' testfixtures==12.3.0 ; python_full_version >= '3.11' text-unidecode==1.3 diff --git a/pyproject.toml b/pyproject.toml index 9a6850d0d3a..d492877a544 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,6 @@ dependencies = [ "bx-python", "celery>=5.4.0", # prefer not downgrading this to upgrading typing-extensions "cloudauthz==0.6.0", - "cloudbridge", "circus", "conda-package-streaming", "CT3>=3.3.3", # Python 3.13 support @@ -128,6 +127,7 @@ test = [ "ase>=3.18.1", "axe-selenium-python", "boto3", + "cloudbridge", "cwltest>=2.5.20240906231108", # Python 3.13 support "fluent-logger", "gcsfs",