Merge branch 'master' into custom-kms-client

Author: texastony

.github/workflows/ci_tests.yaml

@@ -31,7 +31,9 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
-          - 3.x
+          - "3.10"
+          - "3.11"
+          - 3.x  # Ideally, we would skip if 3.x is 3.11
         architecture:
           - x64
           - x86
@@ -61,7 +63,7 @@ jobs:
         env:
           TOXENV: ${{ matrix.category }}
         run: tox -- -vv
-  upstream-py3:
+  upstream-py37:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -81,3 +83,23 @@ jobs:
           env:
             TOXENV: ${{ matrix.category }}
           run: tox -- -vv
+  upstream-py311:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        category:
+          - nocmk
+          - test-upstream-requirements-py311
+    steps:
+        - uses: actions/checkout@v3
+        - uses: actions/setup-python@v4
+          with:
+            python-version: "3.11"
+        - 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

.github/workflows/dependabot-auto-merge.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/[email protected].0
+        uses: dependabot/[email protected].6
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

dev_requirements/linter-requirements.txt

@@ -5,7 +5,7 @@ flake8==4.0.1
 flake8-bugbear==22.9.11
 flake8-docstrings==1.6.0
 flake8-print==4.0.0
-isort==5.10.1
+isort==5.11.4
 pyflakes==2.4.0
 pylint==2.13.5
 readme_renderer==37.3

dev_requirements/release-requirements.txt

@@ -1,4 +1,4 @@
 pypi-parker==0.1.2
-setuptools==62.0.0
+setuptools==66.1.1
 twine==4.0.1
-wheel==0.37.1
+wheel==0.38.4

dev_requirements/test-requirements.txt

@@ -1,4 +1,4 @@
 mock==4.0.3
 pytest==7.2.0
-pytest-cov==3.0.0
+pytest-cov==4.0.0
 pytest-mock==3.6.1

src/aws_encryption_sdk/compatability.py

@@ -35,5 +35,5 @@ def _warn_deprecated_python():
             "bug fixes, and security updates please upgrade to Python {}.{} or "
             "later. For more information, see SUPPORT_POLICY.rst: "
             "https://github.com/aws/aws-encryption-sdk-python/blob/master/SUPPORT_POLICY.rst"
-        ).format(py_version[0], py_version[1], minimum_version[0], minimum_version[1], params["date"])
+        ).format(py_version[0], py_version[1], params["date"], minimum_version[0], minimum_version[1])
         warnings.warn(warning, DeprecationWarning)

test/upstream-requirements-py311.txt

@@ -0,0 +1,20 @@
+attrs==22.2.0
+boto3==1.26.54
+botocore==1.29.54
+cffi==1.15.1
+coverage==7.0.5
+cryptography==39.0.0
+iniconfig==2.0.0
+jmespath==1.0.1
+mock==4.0.3
+packaging==23.0
+pluggy==1.0.0
+pycparser==2.21
+pytest==7.2.0
+pytest-cov==3.0.0
+pytest-mock==3.6.1
+python-dateutil==2.8.2
+s3transfer==0.6.0
+six==1.16.0
+urllib3==1.26.14
+wrapt==1.14.1

test/upstream-requirements-py37.txt

@@ -1,26 +1,25 @@
-attrs==21.2.0
-boto3==1.17.92
-botocore==1.20.92
-cffi==1.14.5
-coverage==5.5
-cryptography==3.4.7
-importlib-metadata==4.5.0
-iniconfig==1.1.1
-jmespath==0.10.0
+attrs==22.2.0
+boto3==1.26.54
+botocore==1.29.54
+cffi==1.15.1
+coverage==7.0.5
+cryptography==39.0.0
+exceptiongroup==1.1.0
+importlib-metadata==6.0.0
+iniconfig==2.0.0
+jmespath==1.0.1
 mock==4.0.3
-packaging==20.9
-pluggy==0.13.1
-py==1.10.0
-pycparser==2.20
-pyparsing==2.4.7
-pytest==6.2.4
-pytest-cov==2.12.1
+packaging==23.0
+pluggy==1.0.0
+pycparser==2.21
+pytest==7.2.0
+pytest-cov==3.0.0
 pytest-mock==3.6.1
-python-dateutil==2.8.1
-s3transfer==0.4.2
+python-dateutil==2.8.2
+s3transfer==0.6.0
 six==1.16.0
-toml==0.10.2
-typing-extensions==3.10.0.0
-urllib3==1.26.5
-wrapt==1.12.1
-zipp==3.4.1
+tomli==2.0.1
+typing_extensions==4.4.0
+urllib3==1.26.14
+wrapt==1.14.1
+zipp==3.11.0

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}-{local,integ,accept,examples}, nocmk,
+    py{37,38,39,310,311}-{local,integ,accept,examples}, nocmk,
     bandit, doc8, readme, docs,
     {flake8,pylint}{,-tests,-examples},
     isort-check, black-check,
@@ -103,6 +103,15 @@ 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
+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-py311.txt
+
 # Test frozen upstream requirements
 [testenv:test-upstream-requirements-base]
 sitepackages = False
@@ -117,6 +126,14 @@ 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
+deps = -rtest/upstream-requirements-py311.txt
+sitepackages = {[testenv:test-upstream-requirements-base]sitepackages}
+recreate = {[testenv:test-upstream-requirements-base]recreate}
+commands = {[testenv:test-upstream-requirements-base]commands}
+
 # Linters
 [testenv:flake8]
 basepython = python3