From c774caf7ab79158ae6bd4604858a3d8672d7d06a Mon Sep 17 00:00:00 2001
From: John Davis <jdavcs@gmail.com>
Date: Fri, 21 Jun 2024 12:50:12 -0400
Subject: [PATCH 1/2] Add admin note on fastapi

---
 doc/source/releases/24.1_announce.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/source/releases/24.1_announce.rst b/doc/source/releases/24.1_announce.rst
index 1f2afbbf0c59..3e60e518e7d6 100644
--- 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>`__]

From ece66de3080975ae1e0a645b7c0f508d62f36917 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Mon, 24 Jun 2024 09:28:36 +0100
Subject: [PATCH 2/2] Update mercurial to non-yanked 6.7.4

Mercurial version 6.7rc0-6.7.3 have been yanked on PyPI with message:

```
critical bug that can destroy the changelog of repositories
```
---
 lib/galaxy/dependencies/pinned-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index f25d7b6a27c7..059e15dd39eb 100644
--- 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"