From 907a4646fe14c55599e430e5d73338c095408bff Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:48:44 -0800 Subject: [PATCH 1/3] chore: bump deps & document upstream test --- .github/workflows/ci_test-vector-handler.yaml | 2 +- dev_requirements/linter-requirements.txt | 4 +-- test/upstream-requirements-py311.txt | 2 +- test/upstream-requirements-py37.txt | 25 ------------------- test/upstream.md | 7 ++++++ tox.ini | 17 ------------- 6 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 test/upstream-requirements-py37.txt create mode 100644 test/upstream.md diff --git a/.github/workflows/ci_test-vector-handler.yaml b/.github/workflows/ci_test-vector-handler.yaml index 12ecf8f93..377e13962 100644 --- a/.github/workflows/ci_test-vector-handler.yaml +++ b/.github/workflows/ci_test-vector-handler.yaml @@ -37,7 +37,7 @@ jobs: - os: macos-latest architecture: x86 steps: - - uses: aws-actions/configure-aws-credentials@v1 + - uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.INTEG_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.INTEG_AWS_SECRET_ACCESS_KEY }} diff --git a/dev_requirements/linter-requirements.txt b/dev_requirements/linter-requirements.txt index 9d10c38e0..1295e522d 100644 --- a/dev_requirements/linter-requirements.txt +++ b/dev_requirements/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.4 -black==22.3.0 +black==24.2.0 doc8==0.10.1 flake8==4.0.1 flake8-bugbear==22.9.11 @@ -10,4 +10,4 @@ pyflakes==2.4.0 pylint==2.13.5 readme_renderer==37.3 seed-isort-config==2.2.0 -vulture==2.6 +vulture==2.9.1 diff --git a/test/upstream-requirements-py311.txt b/test/upstream-requirements-py311.txt index f15b300fc..16ae4654a 100644 --- a/test/upstream-requirements-py311.txt +++ b/test/upstream-requirements-py311.txt @@ -3,7 +3,7 @@ boto3==1.26.54 botocore==1.29.54 cffi==1.15.1 coverage==7.0.5 -cryptography==41.0.6 +cryptography==42.0.4 iniconfig==2.0.0 jmespath==1.0.1 mock==4.0.3 diff --git a/test/upstream-requirements-py37.txt b/test/upstream-requirements-py37.txt deleted file mode 100644 index e4943172e..000000000 --- a/test/upstream-requirements-py37.txt +++ /dev/null @@ -1,25 +0,0 @@ -attrs==22.2.0 -boto3==1.26.54 -botocore==1.29.54 -cffi==1.15.1 -coverage==7.0.5 -cryptography==41.0.6 -exceptiongroup==1.1.0 -importlib-metadata==6.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 -tomli==2.0.1 -typing_extensions==4.4.0 -urllib3==1.26.18 -wrapt==1.14.1 -zipp==3.11.0 diff --git a/test/upstream.md b/test/upstream.md new file mode 100644 index 000000000..aeb3ed638 --- /dev/null +++ b/test/upstream.md @@ -0,0 +1,7 @@ +AWS Crypto Tools maintains `test/upstream-requirements-py.txt` in our Python products such that +our Cryptographic Primitive Provider for Python ([pyca/cryptography](https://github.com/pyca/cryptography)) +may execute downstream tests against AWS Crypto Tools Python products. +These files allow pyca to install and test the Crypto Tools products. +Additionally, Crypto Tools should maintain a test configuration that can be completed without using any AWS resources. +If Crypto Tools needs to contact pyca about this expectation, +they should cut a issue to the pyca/cryptography repo. diff --git a/tox.ini b/tox.ini index 9ca7a0cd6..aa1ea5325 100644 --- a/tox.ini +++ b/tox.ini @@ -94,15 +94,6 @@ recreate = True deps = commands = {toxinidir}/test/freeze-upstream-requirements.sh -# Freeze for Python 3.7 -[testenv:freeze-upstream-requirements-py37] -basepython = python3.7 -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-py37.txt - # Freeze for Python 3.11 [testenv:freeze-upstream-requirements-py311] basepython = python3.11 @@ -118,14 +109,6 @@ sitepackages = False recreate = True commands = {[testenv:base-command]commands} test/ -m local -# Test frozen upstream requirements for Python 3.7 -[testenv:test-upstream-requirements-py37] -basepython = python3.7 -deps = -rtest/upstream-requirements-py37.txt -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 From 4410f6ca9d0a3f7ea600503bf29aca8eaa0cce49 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:56:05 -0800 Subject: [PATCH 2/3] chore: trigger CI rerun to remove upstream 37 From 2e6e817dc3602760e73c13ccbcec7c213fb5575d Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:59:32 -0800 Subject: [PATCH 3/3] chore: remove upstream py37 from GHW --- .github/workflows/ci_tests.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 9d491203c..34cb66dad 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -64,26 +64,6 @@ jobs: env: TOXENV: ${{ matrix.category }} run: tox -- -vv - upstream-py37: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - category: - - nocmk - - test-upstream-requirements-py37 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - 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 upstream-py311: runs-on: ubuntu-latest strategy: