From 8b6a49388c85785a22d59430007b7873ac8acf96 Mon Sep 17 00:00:00 2001 From: Tony Knapp <5892063+texastony@users.noreply.github.com> Date: Wed, 23 Nov 2022 16:54:41 -0800 Subject: [PATCH] chore: drop py3.6 from Oracle & Test Vectors (#529) --- .github/workflows/ci_decrypt-oracle.yaml | 6 +- .github/workflows/ci_test-vector-handler.yaml | 4 +- .github/workflows/ci_tests.yaml | 1 - buildspec.yml | 2 - codebuild/py36/awses_local.yml | 27 --- decrypt_oracle/setup.py | 1 - decrypt_oracle/tox.ini | 42 +--- test_vector_handlers/LICENSE | 201 ++++++++++++++++++ test_vector_handlers/MANIFEST.in | 4 - test_vector_handlers/README.rst | 4 +- test_vector_handlers/setup.py | 2 - .../aws-crypto-tools-test-vector-framework | 2 +- test_vector_handlers/tox.ini | 28 +-- 13 files changed, 217 insertions(+), 107 deletions(-) delete mode 100644 codebuild/py36/awses_local.yml create mode 100644 test_vector_handlers/LICENSE diff --git a/.github/workflows/ci_decrypt-oracle.yaml b/.github/workflows/ci_decrypt-oracle.yaml index 149adea13..335bc8e98 100644 --- a/.github/workflows/ci_decrypt-oracle.yaml +++ b/.github/workflows/ci_decrypt-oracle.yaml @@ -14,8 +14,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - # The oracle runs in a Python 3.6 Lamba - python-version: 3.6 + # The oracle will run on a Python 3.9 Lamba + python-version: 3.9 - run: | python -m pip install --upgrade pip pip install --upgrade -r dev_requirements/ci-requirements.txt @@ -41,7 +41,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.9 - run: | python -m pip install --upgrade pip pip install --upgrade -r dev_requirements/ci-requirements.txt diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 8198ef2cd..81ad1fa09 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -21,8 +21,6 @@ jobs: - windows-latest - macos-latest python: - - 2.7 - - 3.6 - 3.7 - 3.8 - 3.x @@ -75,7 +73,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.9 - run: | python -m pip install --upgrade pip pip install --upgrade -r dev_requirements/ci-requirements.txt diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 81d6f7621..3e4f51c93 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -28,7 +28,6 @@ jobs: - windows-latest - macos-latest python: - - 3.6 - 3.7 - 3.8 - 3.9 diff --git a/buildspec.yml b/buildspec.yml index bb1e0cd97..5d50f5675 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -7,8 +7,6 @@ batch: buildspec: codebuild/py36/integ.yml - identifier: py36_examples buildspec: codebuild/py36/examples.yml - - identifier: py36_awses_local - buildspec: codebuild/py36/awses_local.yml - identifier: py37_integ buildspec: codebuild/py37/integ.yml diff --git a/codebuild/py36/awses_local.yml b/codebuild/py36/awses_local.yml deleted file mode 100644 index b68a7e434..000000000 --- a/codebuild/py36/awses_local.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 0.2 - -env: - variables: - TOXENV: "py36-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.6.15 - - pyenv local 3.6.15 - - pip install tox tox-pyenv - - cd test_vector_handlers - - tox diff --git a/decrypt_oracle/setup.py b/decrypt_oracle/setup.py index c56d64911..f68454392 100644 --- a/decrypt_oracle/setup.py +++ b/decrypt_oracle/setup.py @@ -45,7 +45,6 @@ def get_requirements(): "Natural Language :: English", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", diff --git a/decrypt_oracle/tox.ini b/decrypt_oracle/tox.ini index b90d9f527..ce640bd32 100644 --- a/decrypt_oracle/tox.ini +++ b/decrypt_oracle/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{36,37,38,39}-{local,integ}, + py{39}-{local,integ}, bandit, doc8, readme, docs, {flake8,pylint}{,-tests}, # prone to false positives @@ -35,7 +35,7 @@ envlist = [testenv:generate-pipeline] -basepython = python3 +basepython = python3.9 skip_install = true deps = troposphere[policy] @@ -44,7 +44,7 @@ commands = python .chalice/pipeline.py {posargs} [testenv:chalice-prep] -basepython = python3.6 +basepython = python3.9 skip_install = true recreate = true deps = {[testenv:build]deps} @@ -59,7 +59,7 @@ commands = python {toxinidir}/.chalice/build-requirements.py [testenv:chalice] -basepython = python3.6 +basepython = python3.9 recreate = true deps = {[testenv:chalice-prep]deps} @@ -69,7 +69,7 @@ commands = chalice {posargs} [testenv:chalice-deploy] -basepython = python3.6 +basepython = python3.9 recreate = true deps = {[testenv:chalice]deps} @@ -141,17 +141,6 @@ commands = {posargs} {[testenv:mypy-coverage]commands} -[testenv:mypy-py2] -basepython = {[testenv:mypy-common]basepython} -deps = {[testenv:mypy-common]deps} -commands = - python -m mypy \ - --py2 \ - --linecoverage-report build \ - src/aws_encryption_sdk_decrypt_oracle/ \ - {posargs} - {[testenv:mypy-coverage]commands} - # Linters [testenv:flake8] basepython = python3 @@ -167,7 +156,6 @@ commands = app.py \ setup.py \ .chalice/pipeline.py \ - #doc/conf.py \ {posargs} [testenv:flake8-tests] @@ -218,7 +206,6 @@ commands = src/aws_encryption_sdk_decrypt_oracle/ \ setup.py \ app.py \ - #doc/conf.py \ test/ \ .chalice/pipeline.py \ {posargs} @@ -276,7 +263,7 @@ basepython = python3 deps = sphinx doc8 -commands = doc8 doc/index.rst README.rst CHANGELOG.rst +commands = doc8 README.rst [testenv:readme] basepython = python3 @@ -319,21 +306,6 @@ commands = {[testenv:flake8-tests]commands} {[testenv:pylint-tests]commands} -# Documentation -[testenv:docs] -basepython = python3 -deps = -rdoc/requirements.txt -commands = - sphinx-build -E -c doc/ -b html doc/ doc/build/html - -[testenv:serve-docs] -basepython = python3 -skip_install = true -changedir = doc/build/html -deps = -commands = - python -m http.server {posargs} - # Release tooling [testenv:park] basepython = python3 @@ -347,11 +319,9 @@ commands = python setup.py park basepython = python3 skip_install = true deps = - #{[testenv:docs]deps} wheel setuptools commands = - #{[testenv:docs]commands} python setup.py sdist bdist_wheel [testenv:test-release] diff --git a/test_vector_handlers/LICENSE b/test_vector_handlers/LICENSE new file mode 100644 index 000000000..8dada3eda --- /dev/null +++ b/test_vector_handlers/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/test_vector_handlers/MANIFEST.in b/test_vector_handlers/MANIFEST.in index 132bd9406..71b01728a 100644 --- a/test_vector_handlers/MANIFEST.in +++ b/test_vector_handlers/MANIFEST.in @@ -1,9 +1,5 @@ include README.rst -include CHANGELOG.rst -include CONTRIBUTING.rst include LICENSE include requirements.txt -recursive-include doc * recursive-include test *.py -recursive-include examples *.py \ No newline at end of file diff --git a/test_vector_handlers/README.rst b/test_vector_handlers/README.rst index 382352736..846400127 100644 --- a/test_vector_handlers/README.rst +++ b/test_vector_handlers/README.rst @@ -12,7 +12,7 @@ Getting Started Required Prerequisites ====================== -* Python 2.7 or 3.4+ +* Python 3.7+ * aws-encryption-sdk Use @@ -75,4 +75,4 @@ decrypt and verify all referenced ciphertexts. -h, --help show this help message and exit --input INPUT Existing full message decrypt manifest -.. _shared test vectors repository: https://github.com/awslabs/aws-encryption-sdk-test-vectors \ No newline at end of file +.. _shared test vectors repository: https://github.com/awslabs/aws-encryption-sdk-test-vectors diff --git a/test_vector_handlers/setup.py b/test_vector_handlers/setup.py index 9a89fb698..54d857db0 100644 --- a/test_vector_handlers/setup.py +++ b/test_vector_handlers/setup.py @@ -46,8 +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", "Programming Language :: Python :: 3.9", diff --git a/test_vector_handlers/test/aws-crypto-tools-test-vector-framework b/test_vector_handlers/test/aws-crypto-tools-test-vector-framework index 1779b438f..c3d73fae2 160000 --- a/test_vector_handlers/test/aws-crypto-tools-test-vector-framework +++ b/test_vector_handlers/test/aws-crypto-tools-test-vector-framework @@ -1 +1 @@ -Subproject commit 1779b438f23cb356d5cab7ca40068dcb827b4cb1 +Subproject commit c3d73fae260fd9e9cc9e746f09a7ffbab83576e2 diff --git a/test_vector_handlers/tox.ini b/test_vector_handlers/tox.ini index 10be9652d..643750cd2 100644 --- a/test_vector_handlers/tox.ini +++ b/test_vector_handlers/tox.ini @@ -2,9 +2,9 @@ envlist = # The test vectors depend on new features now, # so until release we can only effectively test the local version of the ESDK. - py{35,36,37,38,39,310}-awses_local, + py{37,38,39,310}-awses_local, # 1.2.0 and 1.2.max are being difficult because of attrs - bandit, doc8, readme, docs, + bandit, doc8, readme, {flake8,pylint}{,-tests}, # prone to false positives vulture @@ -30,8 +30,6 @@ envlist = # Operational helper environments: # -# docs :: Builds Sphinx documentation. -# serve-docs :: Starts local webserver to serve built documentation. # build :: Builds source and wheel dist files. # test-release :: Builds dist files and uploads to testpypi pypirc profile. # release :: Builds dist files and uploads to pypi pypirc profile. @@ -110,7 +108,6 @@ commands = flake8 \ src/awses_test_vectors/ \ setup.py \ - #doc/conf.py \ {posargs} [testenv:flake8-tests] @@ -152,7 +149,6 @@ commands = black --line-length 120 \ src/awses_test_vectors/ \ setup.py \ - #doc/conf.py \ test/ \ {posargs} @@ -182,7 +178,6 @@ deps = -r../dev_requirements/linter-requirements.txt commands = isort -rc \ src \ test \ - #doc \ setup.py \ {posargs} @@ -204,7 +199,7 @@ commands = [testenv:doc8] basepython = python3 deps = -r../dev_requirements/linter-requirements.txt -commands = doc8 doc/index.rst README.rst CHANGELOG.rst +commands = doc8 README.rst [testenv:readme] basepython = python3 @@ -246,21 +241,6 @@ commands = {[testenv:flake8-tests]commands} {[testenv:pylint-tests]commands} -# Documentation -[testenv:docs] -basepython = python3 -deps = -rdoc/requirements.txt -commands = - sphinx-build -E -c doc/ -b html doc/ doc/build/html - -[testenv:serve-docs] -basepython = python3 -skip_install = true -changedir = doc/build/html -deps = -commands = - python -m http.server {posargs} - # Release tooling [testenv:park] basepython = python3 @@ -272,10 +252,8 @@ commands = python setup.py park basepython = python3 skip_install = true deps = - {[testenv:docs]deps} -r../dev_requirements/release-requirements.txt commands = - {[testenv:docs]commands} python setup.py sdist bdist_wheel [testenv:test-release]