From bc22eb72b84220cf94317793a7d1647a6b1c50e1 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:01:29 -0500 Subject: [PATCH 1/4] ci(GitHub): update setup-python to v2 --- .github/workflows/ci_decrypt-oracle.yaml | 2 +- .github/workflows/ci_static-analysis.yaml | 2 +- .github/workflows/ci_test-vector-handler.yaml | 2 +- .github/workflows/ci_tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_decrypt-oracle.yaml b/.github/workflows/ci_decrypt-oracle.yaml index 7bced5ebf..e773bd98a 100644 --- a/.github/workflows/ci_decrypt-oracle.yaml +++ b/.github/workflows/ci_decrypt-oracle.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 with: # The oracle runs in a Python 3.6 Lamba python-version: 3.6 diff --git a/.github/workflows/ci_static-analysis.yaml b/.github/workflows/ci_static-analysis.yaml index 1b659fa5a..31705a5d3 100644 --- a/.github/workflows/ci_static-analysis.yaml +++ b/.github/workflows/ci_static-analysis.yaml @@ -28,7 +28,7 @@ jobs: - isort-check steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 with: python-version: 3.8 - run: | diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 1b24390e4..75556dc13 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -47,7 +47,7 @@ jobs: aws-secret-access-key: ${{ secrets.INTEG_AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} architecture: ${{ matrix.architecture }} diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 0926e60ad..aa4da3886 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -52,7 +52,7 @@ jobs: architecture: x86 steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} architecture: ${{ matrix.architecture }} From dad35cc92c7e11024452152f20c03166e0380b3f Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:07:22 -0500 Subject: [PATCH 2/4] ci(CodeBuild): update CodeBuild to the latest minor releases of python --- codebuild/py35/awses_local.yml | 4 ++-- codebuild/py35/examples.yml | 4 ++-- codebuild/py35/integ.yml | 4 ++-- codebuild/py36/awses_local.yml | 6 ++++-- codebuild/py36/examples.yml | 4 +++- codebuild/py36/integ.yml | 4 +++- codebuild/py37/awses_local.yml | 4 ++-- codebuild/py37/examples.yml | 4 ++-- codebuild/py37/integ.yml | 4 ++-- codebuild/py38/awses_local.yml | 4 ++-- codebuild/py38/examples.yml | 4 ++-- codebuild/py38/integ.yml | 4 ++-- codebuild/py39/awses_1.7.1.yml | 4 ++-- codebuild/py39/awses_2.0.0.yml | 4 ++-- codebuild/py39/awses_latest.yml | 4 ++-- codebuild/py39/examples.yml | 4 ++-- codebuild/py39/integ.yml | 4 ++-- 17 files changed, 38 insertions(+), 32 deletions(-) diff --git a/codebuild/py35/awses_local.yml b/codebuild/py35/awses_local.yml index 71583417a..77668996d 100644 --- a/codebuild/py35/awses_local.yml +++ b/codebuild/py35/awses_local.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.5.9 - - pyenv local 3.5.9 + - 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 index 109f2764c..08939ca07 100644 --- a/codebuild/py35/examples.yml +++ b/codebuild/py35/examples.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.5.9 - - pyenv local 3.5.9 + - 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 index 0014378ba..bcec41b6c 100644 --- a/codebuild/py35/integ.yml +++ b/codebuild/py35/integ.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.5.9 - - pyenv local 3.5.9 + - pyenv install 3.5.10 + - pyenv local 3.5.10 - pip install tox tox-pyenv - tox diff --git a/codebuild/py36/awses_local.yml b/codebuild/py36/awses_local.yml index dba6a28ba..cd3296ea5 100644 --- a/codebuild/py36/awses_local.yml +++ b/codebuild/py36/awses_local.yml @@ -20,6 +20,8 @@ phases: python: latest build: commands: - - pip install tox - - cd test_vector_handlers + - pyenv install 3.6.15 + - pyenv local 3.6.15 + - pip install tox tox-pyenv - tox +’ diff --git a/codebuild/py36/examples.yml b/codebuild/py36/examples.yml index 1bd091d11..46af14902 100644 --- a/codebuild/py36/examples.yml +++ b/codebuild/py36/examples.yml @@ -18,5 +18,7 @@ phases: python: latest build: commands: - - pip install tox + - pyenv install 3.6.15 + - pyenv local 3.6.15 + - pip install tox tox-pyenv - tox diff --git a/codebuild/py36/integ.yml b/codebuild/py36/integ.yml index 35124c835..d55581c43 100644 --- a/codebuild/py36/integ.yml +++ b/codebuild/py36/integ.yml @@ -18,5 +18,7 @@ phases: python: latest build: commands: - - pip install tox + - pyenv install 3.6.15 + - pyenv local 3.6.15 + - pip install tox tox-pyenv - tox diff --git a/codebuild/py37/awses_local.yml b/codebuild/py37/awses_local.yml index 958823841..9e77d43f7 100644 --- a/codebuild/py37/awses_local.yml +++ b/codebuild/py37/awses_local.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.7.9 - - pyenv local 3.7.9 + - pyenv install 3.7.12 + - pyenv local 3.7.12 - pip install tox tox-pyenv - cd test_vector_handlers - tox diff --git a/codebuild/py37/examples.yml b/codebuild/py37/examples.yml index cbe251cf0..57d1626df 100644 --- a/codebuild/py37/examples.yml +++ b/codebuild/py37/examples.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.7.9 - - pyenv local 3.7.9 + - pyenv install 3.7.12 + - pyenv local 3.7.12 - pip install tox tox-pyenv - tox diff --git a/codebuild/py37/integ.yml b/codebuild/py37/integ.yml index 27ce515d0..04d24c26d 100644 --- a/codebuild/py37/integ.yml +++ b/codebuild/py37/integ.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.7.9 - - pyenv local 3.7.9 + - pyenv install 3.7.12 + - pyenv local 3.7.12 - pip install tox tox-pyenv - tox diff --git a/codebuild/py38/awses_local.yml b/codebuild/py38/awses_local.yml index b221abe72..4e20973d4 100644 --- a/codebuild/py38/awses_local.yml +++ b/codebuild/py38/awses_local.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.8.6 - - pyenv local 3.8.6 + - pyenv install 3.8.12 + - pyenv local 3.8.12 - pip install tox tox-pyenv - cd test_vector_handlers - tox diff --git a/codebuild/py38/examples.yml b/codebuild/py38/examples.yml index c9a9f9a7a..1a8f4f826 100644 --- a/codebuild/py38/examples.yml +++ b/codebuild/py38/examples.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.8.6 - - pyenv local 3.8.6 + - pyenv install 3.8.12 + - pyenv local 3.8.12 - pip install tox tox-pyenv - tox diff --git a/codebuild/py38/integ.yml b/codebuild/py38/integ.yml index 31cbb7d43..28eae25fc 100644 --- a/codebuild/py38/integ.yml +++ b/codebuild/py38/integ.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.8.6 - - pyenv local 3.8.6 + - pyenv install 3.8.12 + - pyenv local 3.8.12 - pip install tox tox-pyenv - tox diff --git a/codebuild/py39/awses_1.7.1.yml b/codebuild/py39/awses_1.7.1.yml index 4da84dfa5..e261b5e4d 100644 --- a/codebuild/py39/awses_1.7.1.yml +++ b/codebuild/py39/awses_1.7.1.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.9.0 - - pyenv local 3.9.0 + - pyenv install 3.9.7 + - pyenv local 3.9.7 - 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 index cf8f90b36..b4a6654d5 100644 --- a/codebuild/py39/awses_2.0.0.yml +++ b/codebuild/py39/awses_2.0.0.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.9.0 - - pyenv local 3.9.0 + - pyenv install 3.9.7 + - pyenv local 3.9.7 - pip install tox tox-pyenv - cd test_vector_handlers - tox diff --git a/codebuild/py39/awses_latest.yml b/codebuild/py39/awses_latest.yml index 9a2b12190..ac70cede8 100644 --- a/codebuild/py39/awses_latest.yml +++ b/codebuild/py39/awses_latest.yml @@ -20,8 +20,8 @@ phases: python: latest build: commands: - - pyenv install 3.9.0 - - pyenv local 3.9.0 + - pyenv install 3.9.7 + - pyenv local 3.9.7 - pip install tox tox-pyenv - cd test_vector_handlers - tox diff --git a/codebuild/py39/examples.yml b/codebuild/py39/examples.yml index 38b1f01c7..9b1911024 100644 --- a/codebuild/py39/examples.yml +++ b/codebuild/py39/examples.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.9.0 - - pyenv local 3.9.0 + - pyenv install 3.9.7 + - pyenv local 3.9.7 - pip install tox tox-pyenv - tox diff --git a/codebuild/py39/integ.yml b/codebuild/py39/integ.yml index 49e8f6d1c..c7452e37e 100644 --- a/codebuild/py39/integ.yml +++ b/codebuild/py39/integ.yml @@ -18,7 +18,7 @@ phases: python: latest build: commands: - - pyenv install 3.9.0 - - pyenv local 3.9.0 + - pyenv install 3.9.7 + - pyenv local 3.9.7 - pip install tox tox-pyenv - tox From 68cc16194dbc5f0eb39764b11ccc23e99d730ffa Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Wed, 3 Nov 2021 09:44:06 -0500 Subject: [PATCH 3/4] style(lint): suppress fstring --- decrypt_oracle/src/pylintrc | 1 + decrypt_oracle/test/pylintrc | 1 + examples/src/pylintrc | 1 + examples/test/pylintrc | 1 + src/pylintrc | 1 + test/pylintrc | 1 + test_vector_handlers/src/pylintrc | 1 + test_vector_handlers/test/pylintrc | 1 + 8 files changed, 8 insertions(+) diff --git a/decrypt_oracle/src/pylintrc b/decrypt_oracle/src/pylintrc index 8dcba5d63..2e1e6336e 100644 --- a/decrypt_oracle/src/pylintrc +++ b/decrypt_oracle/src/pylintrc @@ -3,6 +3,7 @@ disable = bad-continuation, # we let black handle this ungrouped-imports, # we let isort handle this + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [FORMAT] max-line-length = 120 diff --git a/decrypt_oracle/test/pylintrc b/decrypt_oracle/test/pylintrc index bb64faf87..3d4a895b2 100644 --- a/decrypt_oracle/test/pylintrc +++ b/decrypt_oracle/test/pylintrc @@ -5,6 +5,7 @@ disable = missing-docstring, # we don't write docstrings for tests bad-continuation, # we let black handle this ungrouped-imports, # we let isort handle this + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [FORMAT] max-line-length = 120 diff --git a/examples/src/pylintrc b/examples/src/pylintrc index dcb72e849..858fa4d96 100644 --- a/examples/src/pylintrc +++ b/examples/src/pylintrc @@ -14,6 +14,7 @@ disable = attribute-defined-outside-init, # breaks with attrs_post_init abstract-method, # throws false positives on io.BaseIO grandchildren redefined-outer-name, # we do this on purpose in multiple places + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [BASIC] # Allow function names up to 50 characters diff --git a/examples/test/pylintrc b/examples/test/pylintrc index b30a3e202..67090eedf 100644 --- a/examples/test/pylintrc +++ b/examples/test/pylintrc @@ -7,6 +7,7 @@ disable = # unknown modules as non-standard-library. flake8 tests for this as well # and does treat them properly duplicate-code, # tests for similar things tend to be similar + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [VARIABLES] additional-builtins = raw_input diff --git a/src/pylintrc b/src/pylintrc index 1919d76e5..d187a5ea8 100644 --- a/src/pylintrc +++ b/src/pylintrc @@ -14,6 +14,7 @@ disable = useless-object-inheritance, raise-missing-from, super-with-arguments, + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [BASIC] # Allow function names up to 50 characters diff --git a/test/pylintrc b/test/pylintrc index 599a9e182..21365a29e 100644 --- a/test/pylintrc +++ b/test/pylintrc @@ -22,6 +22,7 @@ disable = useless-object-inheritance, raise-missing-from, super-with-arguments, + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [VARIABLES] additional-builtins = raw_input diff --git a/test_vector_handlers/src/pylintrc b/test_vector_handlers/src/pylintrc index ebd2eb02e..c78fe416a 100644 --- a/test_vector_handlers/src/pylintrc +++ b/test_vector_handlers/src/pylintrc @@ -8,6 +8,7 @@ disable = useless-object-inheritance, raise-missing-from, super-with-arguments, + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [FORMAT] max-line-length = 120 diff --git a/test_vector_handlers/test/pylintrc b/test_vector_handlers/test/pylintrc index 5aa03d3ae..bc118f899 100644 --- a/test_vector_handlers/test/pylintrc +++ b/test_vector_handlers/test/pylintrc @@ -11,6 +11,7 @@ disable = useless-object-inheritance, raise-missing-from, super-with-arguments, + consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation [FORMAT] max-line-length = 120 From bddef9e5263be2306b3b30ad187580fb0f897b8e Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 4 Nov 2021 14:48:18 -0500 Subject: [PATCH 4/4] fix(CodeBuild): typo in Python3.6 awses_local --- codebuild/py36/awses_local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/py36/awses_local.yml b/codebuild/py36/awses_local.yml index cd3296ea5..b68a7e434 100644 --- a/codebuild/py36/awses_local.yml +++ b/codebuild/py36/awses_local.yml @@ -23,5 +23,5 @@ phases: - pyenv install 3.6.15 - pyenv local 3.6.15 - pip install tox tox-pyenv + - cd test_vector_handlers - tox -’