Commit e02ac41d authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

Sync with dev

See merge request !138
parents d75befcf 743f8b89

lib/galaxy/objectstore/rucio.py

+3 −2
Original line number Diff line number Diff line
@@ -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

lib/galaxy/tool_util/output_checker.py

+2 −2
Original line number Diff line number Diff line
@@ -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(