From 6d9e240c27110d8aed222e752d2e04f90d9fd632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 May 2023 22:17:21 +0000
Subject: [PATCH 1/9] build(deps): bump django from 3.2.16 to 3.2.19

Bumps [django](https://github.com/django/django) from 3.2.16 to 3.2.19.
- [Commits](https://github.com/django/django/compare/3.2.16...3.2.19)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e4e320f4..0408d76b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,6 @@ cffi==1.15.1
     # via cryptography
 charset-normalizer==2.1.1
     # via requests
-crispy-bootstrap5==0.7
 cryptography==38.0.3
     # via social-auth-core
 defusedxml==0.7.1
@@ -21,7 +20,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==1.0.0
     # via -r requirements.in
-django==3.2.16
+django==3.2.19
     # via
     #   -r requirements.in
     #   dj-database-url
@@ -51,7 +50,6 @@ django-extensions==3.2.0
     # via -r requirements.in
 django-imagekit==4.1.0
     # via -r requirements.in
-django-import-export==3.0.1
 django-pandas==0.6.6
     # via -r requirements.in
 django-picklefield==3.1

From 14a26f6fa551662035dc30e088c4e3edc6316588 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:42:42 +0000
Subject: [PATCH 2/9] build(deps): bump django from 3.2.19 to 3.2.23

Bumps [django](https://github.com/django/django) from 3.2.19 to 3.2.23.
- [Commits](https://github.com/django/django/compare/3.2.19...3.2.23)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0408d76b..e7e3292f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==1.0.0
     # via -r requirements.in
-django==3.2.19
+django==3.2.23
     # via
     #   -r requirements.in
     #   dj-database-url
@@ -70,6 +70,8 @@ html2text==2020.1.16
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==6.8.0
+    # via markdown
 markdown==3.4.1
     # via -r requirements.in
 numpy==1.23.2
@@ -128,6 +130,10 @@ social-auth-core==4.3.0
 sqlparse==0.4.2
     # via django
 typing-extensions==4.3.0
-    # via django-countries
+    # via
+    #   django-countries
+    #   pypdf2
 urllib3==1.26.12
     # via requests
+zipp==3.17.0
+    # via importlib-metadata

From 25a46d5ae0a39c3bf50ca01db6542184074e7bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:42:42 +0000
Subject: [PATCH 3/9] build(deps): bump pillow from 9.3.0 to 10.0.1

Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.3.0...10.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0408d76b..692416c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -70,6 +70,8 @@ html2text==2020.1.16
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==6.8.0
+    # via markdown
 markdown==3.4.1
     # via -r requirements.in
 numpy==1.23.2
@@ -84,7 +86,7 @@ pandas==1.4.3
     #   django-pandas
 pilkit==2.0
     # via django-imagekit
-pillow==9.3.0
+pillow==10.0.1
     # via -r requirements.in
 pycparser==2.21
     # via cffi
@@ -128,6 +130,10 @@ social-auth-core==4.3.0
 sqlparse==0.4.2
     # via django
 typing-extensions==4.3.0
-    # via django-countries
+    # via
+    #   django-countries
+    #   pypdf2
 urllib3==1.26.12
     # via requests
+zipp==3.17.0
+    # via importlib-metadata

From e313f77144f55972e29d49001a028affd33732fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:42:47 +0000
Subject: [PATCH 4/9] build(deps): bump certifi from 2022.12.7 to 2023.7.22

Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.
- [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0408d76b..8ef95bd1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@
 #
 asgiref==3.5.2
     # via django
-certifi==2022.12.7
+certifi==2023.7.22
     # via requests
 cffi==1.15.1
     # via cryptography
@@ -70,6 +70,8 @@ html2text==2020.1.16
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==6.8.0
+    # via markdown
 markdown==3.4.1
     # via -r requirements.in
 numpy==1.23.2
@@ -128,6 +130,10 @@ social-auth-core==4.3.0
 sqlparse==0.4.2
     # via django
 typing-extensions==4.3.0
-    # via django-countries
+    # via
+    #   django-countries
+    #   pypdf2
 urllib3==1.26.12
     # via requests
+zipp==3.17.0
+    # via importlib-metadata

From bd85ce67ece66aa6bf7615481b276c643675e277 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:45:47 +0000
Subject: [PATCH 5/9] build(deps): bump cryptography from 38.0.3 to 41.0.4

Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.3 to 41.0.4.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/38.0.3...41.0.4)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0408d76b..7ca6abd5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ cffi==1.15.1
     # via cryptography
 charset-normalizer==2.1.1
     # via requests
-cryptography==38.0.3
+cryptography==41.0.4
     # via social-auth-core
 defusedxml==0.7.1
     # via
@@ -70,6 +70,8 @@ html2text==2020.1.16
     # via -r requirements.in
 idna==3.3
     # via requests
+importlib-metadata==6.8.0
+    # via markdown
 markdown==3.4.1
     # via -r requirements.in
 numpy==1.23.2
@@ -128,6 +130,10 @@ social-auth-core==4.3.0
 sqlparse==0.4.2
     # via django
 typing-extensions==4.3.0
-    # via django-countries
+    # via
+    #   django-countries
+    #   pypdf2
 urllib3==1.26.12
     # via requests
+zipp==3.17.0
+    # via importlib-metadata

From 27a063384fc6fb3c6a3fea791c5bf22db4c7a3ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:56:03 +0000
Subject: [PATCH 6/9] build(deps): bump requests from 2.28.1 to 2.31.0

Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e7e3292f..98fac154 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -110,7 +110,7 @@ pytz==2022.2.1
     #   django-datetime-widget
     #   django-dbbackup
     #   pandas
-requests==2.28.1
+requests==2.31.0
     # via
     #   requests-oauthlib
     #   social-auth-core

From c61a8a4aba2bfb63c1e6c339a3bdbac0362a1b48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:56:16 +0000
Subject: [PATCH 7/9] build(deps): bump urllib3 from 1.26.12 to 1.26.18

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.12 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.12...1.26.18)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e7e3292f..ca7e6be4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -133,7 +133,7 @@ typing-extensions==4.3.0
     # via
     #   django-countries
     #   pypdf2
-urllib3==1.26.12
+urllib3==1.26.18
     # via requests
 zipp==3.17.0
     # via importlib-metadata

From f216ebd324818e2c072dc68a43e0a3307c6c0e7d Mon Sep 17 00:00:00 2001
From: phillybroadbent <phillybroadbent@gmail.com>
Date: Mon, 6 Nov 2023 17:07:33 +0000
Subject: [PATCH 8/9] Edited expense claim email #732

---
 lowfat/fixtures/flatpages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lowfat/fixtures/flatpages.json b/lowfat/fixtures/flatpages.json
index 2631ee1c..54297e74 100644
--- a/lowfat/fixtures/flatpages.json
+++ b/lowfat/fixtures/flatpages.json
@@ -110,7 +110,7 @@
     "fields": {
         "url": "/email/template/expense/claimant/",
         "title": "We received your expense claim",
-        "content": "<!DOCTYPE HTML>\r\n<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\r\n</head>\r\n<body>\r\n<p>Dear {{ expense.fund.claimant.fullname }},</p>\r\n<p>We have received your expenses claim of \u00a3{{ expense.amount_claimed }} for {{ expense.fund.title }}.</p>\r\n<p>We will process it as soon as possible and we will contact you if needed.</p>\r\n<p>You can check the status of your expense claim at <a href=\"{{ protocol }}://{{ site.domain }}{{ expense.link }}\">{{ protocol }}://{{ site.domain }}{{ expense.link }}</a>.</p>\r\n<p>\r\nBest wishes,<br>\r\nFellows Management (<a href=\"mailto:{{ FELLOWS_MANAGEMENT_EMAIL }}\">{{ FELLOWS_MANAGEMENT_EMAIL }}</a>)<br>\r\nSoftware Sustainability Institute\r\n</p>\r\n</body>\r\n</html>",
+        "content": "<!DOCTYPE HTML>\r\n<html>\r\n<head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\r\n</head>\r\n<body>\r\n<p>Dear {{ expense.fund.claimant.fullname }},</p>\r\n<p>We have received your expenses claim of \u00a3{{ expense.amount_claimed }} for {{ expense.fund.title }}.</p>\r\n<p>We will process it as soon as possible and we will contact you if needed.</p>\r\n<p>You can check the status of your expense claim at <a href=\"{{ protocol }}://{{ site.domain }}{{ expense.link }}\">{{ protocol }}://{{ site.domain }}{{ expense.link }}</a>.</p>\r\n<p>\r\n<p>To reply to this message, email <a href=\"mailto:finance@software.ac.uk\">finance@software.ac.uk</a></p>\r\nBest wishes,<br>\r\nFellows Management (<a href=\"mailto:{{ FELLOWS_MANAGEMENT_EMAIL }}\">{{ FELLOWS_MANAGEMENT_EMAIL }}</a>)<br>\r\nSoftware Sustainability Institute\r\n</p>\r\n</body>\r\n</html>",
         "enable_comments": false,
         "template_name": "",
         "registration_required": false,

From fcce8e583144bb61b2bc2dd06e3bb2c3c81681b0 Mon Sep 17 00:00:00 2001
From: phillybroadbent <phillybroadbent@gmail.com>
Date: Wed, 8 Nov 2023 13:37:27 +0000
Subject: [PATCH 9/9] Restoring previous dependencies

---
 requirements.txt | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 20990f10..26bdaa87 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,13 +6,14 @@
 #
 asgiref==3.5.2
     # via django
-certifi==2023.7.22
+certifi==2022.12.7
     # via requests
 cffi==1.15.1
     # via cryptography
 charset-normalizer==2.1.1
     # via requests
-cryptography==41.0.4
+crispy-bootstrap5==0.7
+cryptography==38.0.3
     # via social-auth-core
 defusedxml==0.7.1
     # via
@@ -20,7 +21,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==1.0.0
     # via -r requirements.in
-django==3.2.23
+django==3.2.16
     # via
     #   -r requirements.in
     #   dj-database-url
@@ -50,6 +51,7 @@ django-extensions==3.2.0
     # via -r requirements.in
 django-imagekit==4.1.0
     # via -r requirements.in
+django-import-export==3.0.1
 django-pandas==0.6.6
     # via -r requirements.in
 django-picklefield==3.1
@@ -70,8 +72,6 @@ html2text==2020.1.16
     # via -r requirements.in
 idna==3.3
     # via requests
-importlib-metadata==6.8.0
-    # via markdown
 markdown==3.4.1
     # via -r requirements.in
 numpy==1.23.2
@@ -86,7 +86,7 @@ pandas==1.4.3
     #   django-pandas
 pilkit==2.0
     # via django-imagekit
-pillow==10.0.1
+pillow==9.3.0
     # via -r requirements.in
 pycparser==2.21
     # via cffi
@@ -110,7 +110,7 @@ pytz==2022.2.1
     #   django-datetime-widget
     #   django-dbbackup
     #   pandas
-requests==2.31.0
+requests==2.28.1
     # via
     #   requests-oauthlib
     #   social-auth-core
@@ -130,10 +130,6 @@ social-auth-core==4.3.0
 sqlparse==0.4.2
     # via django
 typing-extensions==4.3.0
-    # via
-    #   django-countries
-    #   pypdf2
-urllib3==1.26.18
-    # via requests
-zipp==3.17.0
-    # via importlib-metadata
+    # via django-countries
+urllib3==1.26.12
+    # via requests
\ No newline at end of file