From 93695dffa489b38d54ea26e5e5590f4f2d9c7610 Mon Sep 17 00:00:00 2001
From: Jim Madge <jmadge@turing.ac.uk>
Date: Mon, 15 Apr 2024 15:59:20 +0100
Subject: [PATCH 1/2] Correct Python version

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index eb7e74529f..7bd8e3d883 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ description = "An open-source framework for creating secure environments to anal
 authors = [
   { name = "Data Safe Haven development team", email = "safehavendevs@turing.ac.uk" },
 ]
-requires-python = "==3.12"
+requires-python = "==3.12.*"
 license = "BSD-3-Clause"
 dependencies = [
   "appdirs~=1.4",

From 624a3a56196ca35c88630be5400a6934f69f58a1 Mon Sep 17 00:00:00 2001
From: Jim Madge <jmadge@turing.ac.uk>
Date: Mon, 15 Apr 2024 16:06:30 +0100
Subject: [PATCH 2/2] Revert "Run lint:fmt"

This reverts commit ce33aa5fd19638aea914d15609e7d3a935748f35.
---
 data_safe_haven/cli.py              | 6 +++---
 data_safe_haven/commands/config.py  | 4 ++--
 data_safe_haven/commands/context.py | 8 ++++----
 data_safe_haven/commands/deploy.py  | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data_safe_haven/cli.py b/data_safe_haven/cli.py
index f8ebfc3bba..ed6aa0a9c4 100644
--- a/data_safe_haven/cli.py
+++ b/data_safe_haven/cli.py
@@ -19,13 +19,13 @@
 
 def callback(
     output: Annotated[
-        Optional[pathlib.Path],
+        Optional[pathlib.Path],  # noqa: UP007
         typer.Option(
             "--output", "-o", resolve_path=True, help="Path to an output log file"
         ),
     ] = None,
     verbosity: Annotated[
-        Optional[int],
+        Optional[int],  # noqa: UP007
         typer.Option(
             "--verbosity",
             "-v",
@@ -35,7 +35,7 @@ def callback(
         ),
     ] = None,
     version: Annotated[
-        Optional[bool],
+        Optional[bool],  # noqa: UP007
         typer.Option(
             "--version", "-V", help="Display the version of this application."
         ),
diff --git a/data_safe_haven/commands/config.py b/data_safe_haven/commands/config.py
index e8cdb88667..1accbd75f1 100644
--- a/data_safe_haven/commands/config.py
+++ b/data_safe_haven/commands/config.py
@@ -14,7 +14,7 @@
 @config_command_group.command()
 def template(
     file: Annotated[
-        Optional[Path],
+        Optional[Path],  # noqa: UP007
         typer.Option(help="File path to write configuration template to."),
     ] = None
 ) -> None:
@@ -43,7 +43,7 @@ def upload(
 @config_command_group.command()
 def show(
     file: Annotated[
-        Optional[Path],
+        Optional[Path],  # noqa: UP007
         typer.Option(help="File path to write configuration template to."),
     ] = None
 ) -> None:
diff --git a/data_safe_haven/commands/context.py b/data_safe_haven/commands/context.py
index 0de2c2ffa8..3addf2ae1e 100644
--- a/data_safe_haven/commands/context.py
+++ b/data_safe_haven/commands/context.py
@@ -112,26 +112,26 @@ def add(
 @context_command_group.command()
 def update(
     admin_group: Annotated[
-        Optional[str],
+        Optional[str],  # noqa: UP007
         typer.Option(
             help="The ID of an Azure group containing all administrators.",
             callback=typer_validate_aad_guid,
         ),
     ] = None,
     location: Annotated[
-        Optional[str],
+        Optional[str],  # noqa: UP007
         typer.Option(
             help="The Azure location to deploy resources into.",
         ),
     ] = None,
     name: Annotated[
-        Optional[str],
+        Optional[str],  # noqa: UP007
         typer.Option(
             help="The human friendly name to give this Data Safe Haven deployment.",
         ),
     ] = None,
     subscription: Annotated[
-        Optional[str],
+        Optional[str],  # noqa: UP007
         typer.Option(
             help="The name of an Azure subscription to deploy resources into.",
         ),
diff --git a/data_safe_haven/commands/deploy.py b/data_safe_haven/commands/deploy.py
index 4ba076cc1f..355effc4da 100644
--- a/data_safe_haven/commands/deploy.py
+++ b/data_safe_haven/commands/deploy.py
@@ -18,7 +18,7 @@
 @deploy_command_group.command()
 def shm(
     force: Annotated[
-        Optional[bool],
+        Optional[bool],  # noqa: UP007
         typer.Option(
             "--force",
             "-f",
@@ -91,7 +91,7 @@ def shm(
 def sre(
     name: Annotated[str, typer.Argument(help="Name of SRE to deploy")],
     force: Annotated[
-        Optional[bool],
+        Optional[bool],  # noqa: UP007
         typer.Option(
             "--force",
             "-f",