diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 75556dc13..1c33fecdb 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -22,7 +22,6 @@ jobs: - macos-latest python: - 2.7 - - 3.5 - 3.6 - 3.7 - 3.8 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index aa4da3886..c562e167f 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -28,7 +28,6 @@ jobs: - windows-latest - macos-latest python: - - 3.5 - 3.6 - 3.7 - 3.8 diff --git a/README.rst b/README.rst index b6feff4da..7f1b22824 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ Getting Started Required Prerequisites ====================== -* Python 3.5+ +* Python 3.6+ * cryptography >= 2.5.0 * boto3 >= 1.10.0 * attrs diff --git a/buildspec.yml b/buildspec.yml index 474054d4b..bb1e0cd97 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -3,13 +3,6 @@ version: 0.2 batch: fast-fail: false build-list: - - identifier: py35_integ - buildspec: codebuild/py35/integ.yml - - identifier: py35_examples - buildspec: codebuild/py35/examples.yml - - identifier: py35_awses_local - buildspec: codebuild/py35/awses_local.yml - - identifier: py36_integ buildspec: codebuild/py36/integ.yml - identifier: py36_examples diff --git a/codebuild/py35/awses_local.yml b/codebuild/py35/awses_local.yml deleted file mode 100644 index 77668996d..000000000 --- a/codebuild/py35/awses_local.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 0.2 - -env: - variables: - TOXENV: "py35-awses_local" - 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_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >- - arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >- - arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - 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.5.10 - - pyenv local 3.5.10 - - pip install tox tox-pyenv - - cd test_vector_handlers - - tox diff --git a/codebuild/py35/examples.yml b/codebuild/py35/examples.yml deleted file mode 100644 index 08939ca07..000000000 --- a/codebuild/py35/examples.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: 0.2 - -env: - variables: - TOXENV: "py35-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 - AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >- - arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >- - arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - -phases: - install: - runtime-versions: - python: latest - build: - commands: - - pyenv install 3.5.10 - - pyenv local 3.5.10 - - pip install tox tox-pyenv - - tox diff --git a/codebuild/py35/integ.yml b/codebuild/py35/integ.yml deleted file mode 100644 index bcec41b6c..000000000 --- a/codebuild/py35/integ.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: 0.2 - -env: - variables: - TOXENV: "py35-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 - AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >- - arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >- - arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7 - -phases: - install: - runtime-versions: - python: latest - build: - commands: - - pyenv install 3.5.10 - - pyenv local 3.5.10 - - pip install tox tox-pyenv - - tox diff --git a/decrypt_oracle/tox.ini b/decrypt_oracle/tox.ini index ef39c65d2..b90d9f527 100644 --- a/decrypt_oracle/tox.ini +++ b/decrypt_oracle/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{35,36,37,38,39}-{local,integ}, + py{36,37,38,39}-{local,integ}, bandit, doc8, readme, docs, {flake8,pylint}{,-tests}, # prone to false positives diff --git a/setup.py b/setup.py index bfe48b091..2db856d89 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,6 @@ def get_requirements(): "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/tox.ini b/tox.ini index 7006ae0e0..f6a293f0c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{35,36,37,38,39,310}-{local,integ,accept,examples}, nocmk, + py{36,37,38,39,310}-{local,integ,accept,examples}, nocmk, bandit, doc8, readme, docs, {flake8,pylint}{,-tests,-examples}, isort-check, black-check,