From c4663c8b68d2b5c7fc04ad57d63743da5ce528b4 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 6 Feb 2024 12:46:36 -0800
Subject: [PATCH 1/2] Update cryptography to 40.0.2 - latest version that
 supports Python 3.6

---
 .github/workflows/tox.yml    | 3 +--
 requirements/accelerated.txt | 2 +-
 tox.ini                      | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 58786345..eed17327 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -52,9 +52,8 @@ jobs:
         strategy:
             max-parallel: 5
             matrix:
-                # only crypto 3.3 seems to work
                 python-version: [ 3.6, 3.7, 3.8, 3.9, '3.10', '3.11' ]
-                crypto-version: [ 3.3 ]
+                crypto-version: [ '40.0.2' ]
 
         steps:
             - uses: actions/checkout@v2
diff --git a/requirements/accelerated.txt b/requirements/accelerated.txt
index 2a2539d5..6231bef0 100644
--- a/requirements/accelerated.txt
+++ b/requirements/accelerated.txt
@@ -1,2 +1,2 @@
 M2Crypto==0.37.1
-cryptography==3.3.2
+cryptography==40.0.2
diff --git a/tox.ini b/tox.ini
index be536961..a5de8a7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-  py{3.6,3.7,3.8,3.9,3.10,3.11}-cryptography{3.3}
+  py{3.6,3.7,3.8,3.9,3.10,3.11}-cryptography{40.0.2}
   postgres
   windows
 
@@ -24,8 +24,7 @@ basepython =
 
 deps =
   -r{toxinidir}/requirements/test.txt
-  cryptography3.3: cryptography==3.3.2
-
+  cryptography40.0.2: cryptography==40.0.2
 commands =
   sh -c '! tests/testapp/manage.py makemigrations --dry-run --exit --noinput'
   python tests/patch_pytest.py

From b316f1888ca39d5f93e082be2d5a82472065ce3b Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 6 Mar 2024 07:59:04 -0800
Subject: [PATCH 2/2] Move cryptography version out of matrix configuration for
 action.

---
 .github/workflows/tox.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index eed17327..2f117030 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -49,11 +49,12 @@ jobs:
         name: Python unit tests + cryptography
         needs: pre_job
         runs-on: ubuntu-20.04
+        env:
+            cryptography_version: '40.0.2'
         strategy:
             max-parallel: 5
             matrix:
                 python-version: [ 3.6, 3.7, 3.8, 3.9, '3.10', '3.11' ]
-                crypto-version: [ '40.0.2' ]
 
         steps:
             - uses: actions/checkout@v2
@@ -77,10 +78,10 @@ jobs:
               uses: actions/cache@v2
               with:
                   path: ${{ github.workspace }}/.tox/py${{ matrix.python-version }}
-                  key: ${{ runner.os }}-tox-py${{ matrix.python-version }}-crypto${{ matrix.crypto-version }}-${{ hashFiles('setup.py', 'requirements/*.txt') }}
+                  key: ${{ runner.os }}-tox-py${{ matrix.python-version }}-crypto${{ env.cryptography_version }}-${{ hashFiles('setup.py', 'requirements/*.txt') }}
             - name: Test with tox
               if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-              run: tox -e py${{ matrix.python-version }}-cryptography${{ matrix.crypto-version }}
+              run: tox -e py${{ matrix.python-version }}-cryptography${{ env.cryptography_version }}
     postgres:
         name: Python postgres unit tests
         needs: pre_job