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 .
This commit is contained in:
Nicola Soranzo
2024-04-25 14:33:21 +01:00
parent 1d64120a00
commit 7c143ceaca
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -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):
@@ -61,5 +61,5 @@ weasyprint
# AWS Batch runner
boto3
#For Rucio storage plugin
rucio-clients==33.6.0
# For Rucio storage plugin
rucio-clients>=33.6.0
+1
View File
@@ -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 = "*"