Merge branch 'release_23.1' into release_23.2

galaxyproject · Oct 16, 2024 · 63b92e7 · 63b92e7
2 parents 471a110 + 1955d28
commit 63b92e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/galaxy/tool_util/deps/conda_util.py b/lib/galaxy/tool_util/deps/conda_util.py
@@ -56,15 +56,15 @@
 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

diff --git a/lib/tool_shed/webapp/api/users.py b/lib/tool_shed/webapp/api/users.py
@@ -52,7 +52,7 @@ def __get_value_mapper(self, trans):
         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 @@ def index(self, trans, deleted=False, **kwd):
             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}