Merge branch 'release_24.1' into dev

galaxyproject · Jun 24, 2024 · a782d24 · a782d24
2 parents 74d5cf1 + 9421bcd
commit a782d24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doc/source/releases/24.1_announce.rst b/doc/source/releases/24.1_announce.rst
@@ -48,6 +48,9 @@ See the `community hub <https://galaxyproject.org/develop/source-code/>`__ for a
 Administration Notes
 ===========================================================
 
+* ``fastapi`` dependency has been replaced with ``fastapi-slim`` [`#18095 <https://github.com/galaxyproject/galaxy/pull/18095>`__]. To ensure a smooth upgrade, you should uninstall ``fastapi`` before upgrading.
+  If you have upgraded without uninstalling ``fastapi``, you should uninstall ``fastapi``, then install ``fastapi-slim``.
+
 * Empowerinig users to bring their own storage and file sources [`#18127 <https://github.com/galaxyproject/galaxy/pull/18127>`__]
 
 * Enabling storage management by object store [`#17500 <https://github.com/galaxyproject/galaxy/pull/17500>`__]

diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -105,7 +105,7 @@ markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.13"
 markdown==3.6 ; python_version >= "3.8" and python_version < "3.13"
 markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "3.13"
 mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.13"
-mercurial==6.7.3 ; python_version >= "3.8" and python_version < "3.13"
+mercurial==6.7.4 ; python_version >= "3.8" and python_version < "3.13"
 mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.13"
 mrcfile==1.5.0 ; python_version >= "3.8" and python_version < "3.13"
 msal==1.28.0 ; python_version >= "3.8" and python_version < "3.13"