diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b43edd760241d36826f7b87459c0654812c1be0d..113f03d4d84c3eb2545df30d60fab8e4b7aaadc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ variables: CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}" CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base" CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit" - GALAXY_VERSION_PYTHON: 25.1.dev0+ornl - GALAXY_VERSION_DOCKER: 25.1.dev0.ornl + GALAXY_VERSION_PYTHON: 25.1.dev1+ornl + GALAXY_VERSION_DOCKER: 25.1.dev1.ornl # This import is for the func_rse_docker_* functions before_script: diff --git a/lib/galaxy/objectstore/rucio.py b/lib/galaxy/objectstore/rucio.py index 420d63cdd481ed7c501271d8f663d7f16677cd57..6d472c5c9d866743463a25f5a26b7b6d860b6097 100644 --- a/lib/galaxy/objectstore/rucio.py +++ b/lib/galaxy/objectstore/rucio.py @@ -184,19 +184,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(