diff --git a/lib/galaxy/objectstore/rucio.py b/lib/galaxy/objectstore/rucio.py index c888b4da8ffe6bdc22542dc426c158f8ac94249b..b42f86dcdcdc57f4b599c65e82af0a056daa7171 100644 --- a/lib/galaxy/objectstore/rucio.py +++ b/lib/galaxy/objectstore/rucio.py @@ -188,19 +188,20 @@ username = {self.config['username']} auth_host=self.config["auth_host"], account=self.config["account"], auth_type=self.config["auth_type"], + logger=log, creds={"username": self.config["username"], "password": self.config["password"]}, ) return client def get_rucio_upload_client(self, auth_token=None): client = self.get_rucio_client() - uc = UploadClient(_client=client) + uc = UploadClient(_client=client,logger=log) uc.auth_token = auth_token return uc def get_rucio_download_client(self, auth_token=None): client = self.get_rucio_client() - dc = DownloadClient(client=client) + dc = DownloadClient(client=client,logger=log) dc.auth_token = auth_token return dc diff --git a/lib/galaxy/tool_util/output_checker.py b/lib/galaxy/tool_util/output_checker.py index 2eb7d6c427db53930d67082cb58b2db617505cc7..09bd9668fbf07758e31646fe94a6e84c44bafe9e 100644 --- a/lib/galaxy/tool_util/output_checker.py +++ b/lib/galaxy/tool_util/output_checker.py @@ -6,7 +6,7 @@ from typing import ( Optional, Tuple, TYPE_CHECKING, - Union, + Union, Any, ) from typing_extensions import ( @@ -59,7 +59,7 @@ class MaxDiscoveredFilesJobMessage(JobMessage): type: Literal["max_discovered_files"] -AnyJobMessage = Union[ExitCodeJobMessage, RegexJobMessage, MaxDiscoveredFilesJobMessage] +AnyJobMessage = Union[ExitCodeJobMessage, RegexJobMessage, MaxDiscoveredFilesJobMessage, Any] def check_output_regex(