From 2319b35efe117db994ef4bf764f14234b410c0c1 Mon Sep 17 00:00:00 2001
From: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com>
Date: Fri, 2 Jun 2023 08:57:39 +0000
Subject: [PATCH 1/3] ci: fix GitHub Actions error

---
 .github/workflows/ci-build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 79740845..a0526ab3 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -37,6 +37,10 @@ jobs:
         run: pip install nox==2020.8.22
       - name: Install Poetry
         run: pip install poetry==1.1.9
+      # This fixes the issue with cachecontrol (https://github.com/psf/cachecontrol/issues/292).
+      # We will not be facing this issue when we upgrade to a newer Poetry version.
+      - name: Install Requests
+        run: pip install 'requests<2.30'
 
       # This command is a workaround for getting Poetry working with Python 3.10. An
       # fix is made in Poetry 1.2.0a2 but there is currently no official release for
@@ -275,6 +279,10 @@ jobs:
         run: cd /home/runner/work/datagateway-api/datagateway-api; cp datagateway_api/search_api_mapping.json.example datagateway_api/search_api_mapping.json
       - name: Install Poetry
         run: pip install poetry==1.1.9
+      # This fixes the issue with cachecontrol (https://github.com/psf/cachecontrol/issues/292).
+      # We will not be facing this issue when we upgrade to a newer Poetry version.
+      - name: Install Requests
+        run: pip install 'requests<2.30'
 
       - name: Install dependencies
         run: poetry install

From be37a7156e08673b4fbe56891c9d7fd62a144fdd Mon Sep 17 00:00:00 2001
From: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com>
Date: Fri, 2 Jun 2023 09:00:14 +0000
Subject: [PATCH 2/3] Ignore werkzeug vulnerability

---
 noxfile.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 7cc42bbc..1a299d6a 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -75,9 +75,10 @@ def safety(session):
         # Ignore 50916 as the latest version of pydantic and
         # Ignore 51457 as the latest version of pytest and
         # Ignore 51668 as the latest version of SQLAchemy and
-        # Ignore 52355 and 52518 as the latest version of gitpython
-        # as they do not support
-        # python 3.6 which is still used in production
+        # Ignore 52322 and 52518 as the latest version of Gitpython does not
+        # support python 3.6 which is still used in production
+        # Ignore 53325, 53326, and 54456 as the fixed versions do not support
+        # python 3.6
         session.run(
             "safety",
             "check",
@@ -97,6 +98,8 @@ def safety(session):
             "53325",
             "--ignore",
             "53326",
+            "--ignore",
+            "54456",
         )
 
         try:

From 623a4b36b0afabf002eb17bcde949ff8032af46d Mon Sep 17 00:00:00 2001
From: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com>
Date: Fri, 16 Jun 2023 07:55:18 +0100
Subject: [PATCH 3/3] Ignore flask vulnerability

---
 noxfile.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/noxfile.py b/noxfile.py
index 1a299d6a..9ea6e3eb 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -77,7 +77,7 @@ def safety(session):
         # Ignore 51668 as the latest version of SQLAchemy and
         # Ignore 52322 and 52518 as the latest version of Gitpython does not
         # support python 3.6 which is still used in production
-        # Ignore 53325, 53326, and 54456 as the fixed versions do not support
+        # Ignore 53325, 53326, 54456, and 55261 as the fixed versions do not support
         # python 3.6
         session.run(
             "safety",
@@ -100,6 +100,8 @@ def safety(session):
             "53326",
             "--ignore",
             "54456",
+            "--ignore",
+            "55261",
         )
 
         try: