diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 5878634..2f11703 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -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 @@ -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 diff --git a/requirements/accelerated.txt b/requirements/accelerated.txt index 2a2539d..6231bef 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 be53696..a5de8a7 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