From 7c143ceacab1b577cb172d0cfdbf2cde60800aa1 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Tue, 23 Apr 2024 17:17:07 +0100
Subject: [PATCH] Fix rucio-clients dependency issues

With the merge of https://github.com/galaxyproject/galaxy/pull/17156 ,
`rucio-clients` was listed as a conditional requirement, but it was actually
installed almost everywhere (the only condition was
`sys.version_info >= (3, 9)`), independently of its use for an object store.

This also installs `rucio-clients` as a dev dependency, otherwise the
`test/integration/objectstore/test_rucio_objectstore.py` integration tests
would fail. Pinned dependencies are updated in the next commit.

Fix https://github.com/galaxyproject/galaxy/issues/17695 .
---
 lib/galaxy/dependencies/__init__.py                  | 2 +-
 lib/galaxy/dependencies/conditional-requirements.txt | 4 ++--
 pyproject.toml                                       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py
index 1664d07e6f0..0bb785aa136 100644
--- a/lib/galaxy/dependencies/__init__.py
+++ b/lib/galaxy/dependencies/__init__.py
@@ -298,7 +298,7 @@ class ConditionalDependencies:
         return self.pkce_support
 
     def check_rucio_clients(self):
-        return sys.version_info >= (3, 9)
+        return "rucio" in self.object_stores and sys.version_info >= (3, 9)
 
 
 def optional(config_file=None):
diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
index e1fa726ff27..2c9efa7eab4 100644
--- a/lib/galaxy/dependencies/conditional-requirements.txt
+++ b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -61,5 +61,5 @@ weasyprint
 # AWS Batch runner
 boto3
 
-#For Rucio storage plugin
-rucio-clients==33.6.0
\ No newline at end of file
+# For Rucio storage plugin
+rucio-clients>=33.6.0
diff --git a/pyproject.toml b/pyproject.toml
index 2fdd4b31429..0ebb92ddf93 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -153,6 +153,7 @@ pytest-playwright = "*"
 pytest-postgresql = "!=3.0.0"  # https://github.com/ClearcodeHQ/pytest-postgresql/issues/426
 pytest-shard = "*"
 responses = "*"
+rucio-clients = {version = ">=33.6.0", python = ">=3.9"}  # https://github.com/galaxyproject/galaxy/pull/17156
 selenium = "*"
 urllib3 = "<2"  # Necessary for poetry for resolve deps for Python 3.8+
 seletools = "*"