Unverified Commit 63b92e71 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_23.1' into release_23.2

parents 471a1109 1955d288

lib/galaxy/tool_util/deps/conda_util.py

+4 −4
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ USE_LOCAL_DEFAULT = False 
def conda_link() -> str:

    if IS_OS_X:

        if "arm64" in platform.platform():

            url = "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-arm64.sh"

            url = "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh"

        else:

            url = "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-x86_64.sh"

            url = "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh"

    else:

        if sys.maxsize > 2**32:

            if "arm64" in platform.platform():

                url = "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-aarch64.sh"

                url = "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-aarch64.sh"

            else:

                url = "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh"

                url = "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh"

        else:

            url = "https://repo.anaconda.com/miniconda/Miniconda3-4.5.12-Linux-x86.sh"

    return url

lib/tool_shed/webapp/api/users.py

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class UsersController(BaseShedAPIController): 
        value_mapper = {"id": trans.security.encode_id}

        return value_mapper



    @web.expose_api_anonymous

    @web.expose_api_anonymous_and_sessionless

    def index(self, trans, deleted=False, **kwd):

        """

        GET /api/users
@@ -67,7 +67,7 @@ class UsersController(BaseShedAPIController): 
            user_dicts.append(user_dict)

        return user_dicts



    @web.expose_api_anonymous

    @web.expose_api_anonymous_and_sessionless

    def show(self, trans, id, **kwd):

        """

        GET /api/users/{encoded_user_id}