Skip to content

Commit

Permalink
Merge pull request #215 from rtibbles/crypto_bro
Browse files Browse the repository at this point in the history
Update cryptography to 40.0.2 - latest version that supports Python 3.6
  • Loading branch information
rtibbles committed Mar 6, 2024
2 parents a9373c0 + b316f18 commit 1eb94cb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +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:
# 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 ]

steps:
- uses: actions/checkout@v2
Expand All @@ -78,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
Expand Down
2 changes: 1 addition & 1 deletion requirements/accelerated.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
M2Crypto==0.37.1
cryptography==3.3.2
cryptography==40.0.2
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down

0 comments on commit 1eb94cb

Please sign in to comment.