Merge branch 'master' into lucmcdon/cfn-ci

Author: lucasmcdonald3

.github/workflows/ci_decrypt-oracle.yaml

@@ -11,7 +11,7 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           # The oracle will run on a Python 3.9 Lamba
@@ -38,7 +38,7 @@ jobs:
           - flake8-tests
           - pylint-tests
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
             python-version: 3.9

.github/workflows/ci_static-analysis.yaml

@@ -27,7 +27,7 @@ jobs:
           - black-check
           - isort-check
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8

.github/workflows/ci_test-vector-handler.yaml

@@ -37,12 +37,12 @@ jobs:
           - os: macos-latest
             architecture: x86
     steps:
-      - uses: aws-actions/configure-aws-credentials@v1
+      - uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.INTEG_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.INTEG_AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
@@ -69,7 +69,7 @@ jobs:
           - flake8-tests
           - pylint-tests
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
             python-version: 3.9

.github/workflows/ci_tests.yaml

@@ -52,7 +52,7 @@ jobs:
           - os: macos-latest
             architecture: x86
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
@@ -64,26 +64,6 @@ jobs:
         env:
           TOXENV: ${{ matrix.category }}
         run: tox -- -vv
-  upstream-py37:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        category:
-          - nocmk
-          - test-upstream-requirements-py37
-    steps:
-        - uses: actions/checkout@v3
-        - uses: actions/setup-python@v4
-          with:
-            python-version: 3.7
-        - run: |
-            python -m pip install --upgrade pip
-            pip install --upgrade -r dev_requirements/ci-requirements.txt
-        - name: run test
-          env:
-            TOXENV: ${{ matrix.category }}
-          run: tox -- -vv
   upstream-py311:
     runs-on: ubuntu-latest
     strategy:
@@ -93,7 +73,7 @@ jobs:
           - nocmk
           - test-upstream-requirements-py311
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
             python-version: "3.11"

.github/workflows/repo-sync.yml

@@ -9,7 +9,7 @@ jobs:
     environment: repo-sync
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: repo-sync/github-sync@v2
       name: Sync repo to branch
       with:

README.rst

@@ -35,7 +35,7 @@ Required Prerequisites
 ======================
 
 * Python 3.7+
-* cryptography >= 2.5.0
+* cryptography >= 3.4.6
 * boto3 >= 1.10.0
 * attrs
 

dev_requirements/linter-requirements.txt

@@ -1,5 +1,5 @@
 bandit==1.7.4
-black==22.3.0
+black==24.2.0
 doc8==0.10.1
 flake8==4.0.1
 flake8-bugbear==22.9.11
@@ -10,4 +10,4 @@ pyflakes==2.4.0
 pylint==2.13.5
 readme_renderer==37.3
 seed-isort-config==2.2.0
-vulture==2.6
+vulture==2.9.1

requirements.txt

@@ -1,4 +1,4 @@
 boto3>=1.10.0
-cryptography>=3.4.0
+cryptography>=3.4.6
 attrs>=17.4.0
 wrapt>=1.10.11

test/upstream-requirements-py311.txt

@@ -3,7 +3,7 @@ boto3==1.26.54
 botocore==1.29.54
 cffi==1.15.1
 coverage==7.0.5
-cryptography==41.0.6
+cryptography==42.0.4
 iniconfig==2.0.0
 jmespath==1.0.1
 mock==4.0.3

test/upstream-requirements-py37.txt

@@ -0,0 +1,7 @@
+AWS Crypto Tools maintains `test/upstream-requirements-py<VERSION>.txt` in our Python products such that 
+our Cryptographic Primitive Provider for Python ([pyca/cryptography](https://github.com/pyca/cryptography))
+may execute downstream tests against AWS Crypto Tools Python products.
+These files allow pyca to install and test the Crypto Tools products.
+Additionally, Crypto Tools should maintain a test configuration that can be completed without using any AWS resources.
+If Crypto Tools needs to contact pyca about this expectation,
+they should cut a issue to the pyca/cryptography repo.

test/upstream.md

@@ -94,15 +94,6 @@ recreate = True
 deps =
 commands = {toxinidir}/test/freeze-upstream-requirements.sh
 
-# Freeze for Python 3.7
-[testenv:freeze-upstream-requirements-py37]
-basepython = python3.7
-sitepackages = {[testenv:freeze-upstream-requirements-base]sitepackages}
-skip_install = {[testenv:freeze-upstream-requirements-base]skip_install}
-recreate = {[testenv:freeze-upstream-requirements-base]recreate}
-deps = {[testenv:freeze-upstream-requirements-base]deps}
-commands = {[testenv:freeze-upstream-requirements-base]commands} test/upstream-requirements-py37.txt
-
 # Freeze for Python 3.11
 [testenv:freeze-upstream-requirements-py311]
 basepython = python3.11
@@ -118,14 +109,6 @@ sitepackages = False
 recreate = True
 commands = {[testenv:base-command]commands} test/ -m local
 
-# Test frozen upstream requirements for Python 3.7
-[testenv:test-upstream-requirements-py37]
-basepython = python3.7
-deps = -rtest/upstream-requirements-py37.txt
-sitepackages = {[testenv:test-upstream-requirements-base]sitepackages}
-recreate = {[testenv:test-upstream-requirements-base]recreate}
-commands = {[testenv:test-upstream-requirements-base]commands}
-
 # Test frozen upstream requirements for Python 3.11
 [testenv:test-upstream-requirements-py311]
 basepython = python3.11