From 9c446b42bfacd1ebf0636897062694ec58d48da2 Mon Sep 17 00:00:00 2001 From: Benjamin Farley Date: Wed, 28 Oct 2020 13:21:03 -0600 Subject: [PATCH 1/2] Update dependency on cryptography Changes in 2.0.x depend on behavior introduced in cryptography 2.5 --- README.rst | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b912a2f21..41ed14540 100644 --- a/README.rst +++ b/README.rst @@ -39,7 +39,7 @@ Required Prerequisites ====================== * Python 2.7+ or 3.4+ -* cryptography >= 1.8.1 +* cryptography >= 2.5.0 * boto3 * attrs diff --git a/requirements.txt b/requirements.txt index 7f8f0d532..51badb814 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ boto3>=1.4.4 -cryptography>=1.8.1 +cryptography>=2.5.0 attrs>=17.4.0 wrapt>=1.10.11 From a5f0c80b039ae837b4e2f1463d356253650f2387 Mon Sep 17 00:00:00 2001 From: Benjamin Farley Date: Wed, 28 Oct 2020 16:02:38 -0600 Subject: [PATCH 2/2] Hardcode python3.8 for static analysis tests in github actions Python3.9 and pylint do not play nicely --- .github/workflows/ci_decrypt-oracle.yaml | 2 +- .github/workflows/ci_static-analysis.yaml | 2 +- .github/workflows/ci_test-vector-handler.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_decrypt-oracle.yaml b/.github/workflows/ci_decrypt-oracle.yaml index d8ecff117..7bced5ebf 100644 --- a/.github/workflows/ci_decrypt-oracle.yaml +++ b/.github/workflows/ci_decrypt-oracle.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.x + python-version: 3.8 - run: | python -m pip install --upgrade pip pip install --upgrade -r ci-requirements.txt diff --git a/.github/workflows/ci_static-analysis.yaml b/.github/workflows/ci_static-analysis.yaml index f80c429fe..1b659fa5a 100644 --- a/.github/workflows/ci_static-analysis.yaml +++ b/.github/workflows/ci_static-analysis.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.x + python-version: 3.8 - run: | python -m pip install --upgrade pip pip install --upgrade -r ci-requirements.txt diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 570133231..1b24390e4 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.x + python-version: 3.8 - run: | python -m pip install --upgrade pip pip install --upgrade -r ci-requirements.txt