diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index c2f297ea2..3e035d9dd 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -29,6 +29,7 @@ jobs: - 3.6 - 3.7 - 3.8 + - 3.9 - 3.x architecture: - x64 diff --git a/buildspec.yml b/buildspec.yml index cdda2a550..4a6bdac42 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -58,5 +58,16 @@ batch: - identifier: py38_awses_latest buildspec: codebuild/py38/awses_latest.yml + - identifier: py39_integ + buildspec: codebuild/py39/integ.yml + - identifier: py39_examples + buildspec: codebuild/py39/examples.yml + - identifier: py39_awses_1_7_1 + buildspec: codebuild/py39/awses_1.7.1.yml + - identifier: py39_awses_2_0_0 + buildspec: codebuild/py39/awses_2.0.0.yml + - identifier: py39_awses_latest + buildspec: codebuild/py39/awses_latest.yml + - identifier: code_coverage buildspec: codebuild/coverage/coverage.yml diff --git a/codebuild/py39/awses_1.7.1.yml b/codebuild/py39/awses_1.7.1.yml new file mode 100644 index 000000000..2ab614cfb --- /dev/null +++ b/codebuild/py39/awses_1.7.1.yml @@ -0,0 +1,23 @@ +version: 0.2 + +env: + variables: + TOXENV: "py39-awses_1.7.1" + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >- + arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >- + arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2 + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_API_DEPLOYMENT_ID: "xi1mwx3ttb" + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_REGION: "us-west-2" + +phases: + install: + runtime-versions: + python: latest + build: + commands: + - pyenv install 3.9.0 + - pyenv local 3.9.0 + - pip install tox tox-pyenv + - cd test_vector_handlers + - tox diff --git a/codebuild/py39/awses_2.0.0.yml b/codebuild/py39/awses_2.0.0.yml new file mode 100644 index 000000000..ed4f0e37b --- /dev/null +++ b/codebuild/py39/awses_2.0.0.yml @@ -0,0 +1,23 @@ +version: 0.2 + +env: + variables: + TOXENV: "py39-awses_2.0.0" + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >- + arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >- + arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2 + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_API_DEPLOYMENT_ID: "xi1mwx3ttb" + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_REGION: "us-west-2" + +phases: + install: + runtime-versions: + python: latest + build: + commands: + - pyenv install 3.9.0 + - pyenv local 3.9.0 + - pip install tox tox-pyenv + - cd test_vector_handlers + - tox diff --git a/codebuild/py39/awses_latest.yml b/codebuild/py39/awses_latest.yml new file mode 100644 index 000000000..21b37c2bd --- /dev/null +++ b/codebuild/py39/awses_latest.yml @@ -0,0 +1,23 @@ +version: 0.2 + +env: + variables: + TOXENV: "py39-awses_latest" + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >- + arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >- + arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2 + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_API_DEPLOYMENT_ID: "xi1mwx3ttb" + AWS_ENCRYPTION_SDK_PYTHON_DECRYPT_ORACLE_REGION: "us-west-2" + +phases: + install: + runtime-versions: + python: latest + build: + commands: + - pyenv install 3.9.0 + - pyenv local 3.9.0 + - pip install tox tox-pyenv + - cd test_vector_handlers + - tox diff --git a/codebuild/py39/examples.yml b/codebuild/py39/examples.yml new file mode 100644 index 000000000..892cdaa63 --- /dev/null +++ b/codebuild/py39/examples.yml @@ -0,0 +1,20 @@ +version: 0.2 + +env: + variables: + TOXENV: "py39-examples" + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >- + arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >- + arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2 + +phases: + install: + runtime-versions: + python: latest + build: + commands: + - pyenv install 3.9.0 + - pyenv local 3.9.0 + - pip install tox tox-pyenv + - tox diff --git a/codebuild/py39/integ.yml b/codebuild/py39/integ.yml new file mode 100644 index 000000000..c652c7b25 --- /dev/null +++ b/codebuild/py39/integ.yml @@ -0,0 +1,20 @@ +version: 0.2 + +env: + variables: + TOXENV: "py39-integ" + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >- + arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f + AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >- + arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2 + +phases: + install: + runtime-versions: + python: latest + build: + commands: + - pyenv install 3.9.0 + - pyenv local 3.9.0 + - pip install tox tox-pyenv + - tox diff --git a/setup.py b/setup.py index 6ceb2d8fb..98d24c563 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,8 @@ def get_requirements(): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Security", "Topic :: Security :: Cryptography", diff --git a/tox.ini b/tox.ini index 40f50bd04..43030695e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,34,35,36,37}-{local,integ,accept,examples}, nocmk, + py{27,34,35,36,37,38,39}-{local,integ,accept,examples}, nocmk, bandit, doc8, readme, docs, {flake8,pylint}{,-tests,-examples}, isort-check, black-check,