From e8db29f81ff581ce24d09a70a1a794dd5c9eb3b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 May 2026 08:03:25 +0000
Subject: [PATCH 1/2] chore(deps): bump cryptography from 46.0.7 to 48.0.0

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

---
updated-dependencies:
- dependency-name: cryptography
  dependency-version: 48.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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 da5c751a758..33c35409cd6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ Markdown==3.10.2
 openpyxl==3.1.5
 Pillow==12.2.0  # required by django-imagekit
 psycopg[c]==3.3.3
-cryptography==46.0.7
+cryptography==48.0.0
 python-dateutil==2.9.0.post0
 redis==7.4.0
 requests==2.33.1

From 4cdd72a4b8abd5cae150e082993ae9c690dc4b4a Mon Sep 17 00:00:00 2001
From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
Date: Wed, 6 May 2026 22:03:18 -0600
Subject: [PATCH 2/2] Update cryptography and psycopg[c] in requirements.txt

Update cryptography and psycopg[c] versions in requirements.
---
 requirements.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4419a3cd0bb..c0b2ab1337b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,13 +30,8 @@ lxml==6.1.0
 Markdown==3.10.2
 openpyxl==3.1.5
 Pillow==12.2.0  # required by django-imagekit
-<<<<<<< dependabot/pip/dev/cryptography-48.0.0
-psycopg[c]==3.3.3
-cryptography==48.0.0
-=======
 psycopg[c]==3.3.4
-cryptography==46.0.7
->>>>>>> dev
+cryptography==48.0.0
 python-dateutil==2.9.0.post0
 redis==7.4.0
 requests==2.33.1