From d5bd7de135b7fec0b2804d3e70327bd02b08c6ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 10:04:38 +0000 Subject: [PATCH 1/3] chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci_static-analysis.yaml | 2 +- .github/workflows/ci_tests.yaml | 6 +++--- .github/workflows/repo-sync.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_static-analysis.yaml b/.github/workflows/ci_static-analysis.yaml index 51c88f5d..69c10358 100644 --- a/.github/workflows/ci_static-analysis.yaml +++ b/.github/workflows/ci_static-analysis.yaml @@ -31,7 +31,7 @@ jobs: - pylint-examples - black-check steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.8 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 1a58792d..c5e7dff0 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -38,7 +38,7 @@ jobs: # - integ-slow # - examples steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} @@ -60,7 +60,7 @@ jobs: - sourcebuildcheck - test-upstream-requirements-py37 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.7 @@ -81,7 +81,7 @@ jobs: - sourcebuildcheck - test-upstream-requirements-py311 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 6b1c6be3..e3776d39 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -9,7 +9,7 @@ jobs: environment: repo-sync runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: repo-sync/github-sync@v2 name: Sync repo to branch with: From f0d78601578a8a1408b908c29aeecd09a3ed1339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 09:11:38 +0000 Subject: [PATCH 2/3] chore(deps): bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci_static-analysis.yaml | 2 +- .github/workflows/ci_tests.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_static-analysis.yaml b/.github/workflows/ci_static-analysis.yaml index 51c88f5d..074a22f9 100644 --- a/.github/workflows/ci_static-analysis.yaml +++ b/.github/workflows/ci_static-analysis.yaml @@ -32,7 +32,7 @@ jobs: - black-check steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.8 - run: | diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index f4fddb65..cc05e5ed 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -40,7 +40,7 @@ jobs: # - examples steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} architecture: ${{ matrix.platform.architecture }} @@ -63,7 +63,7 @@ jobs: - test-upstream-requirements-py37 steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.7 - run: | @@ -85,7 +85,7 @@ jobs: - test-upstream-requirements-py311 steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.11" - run: | From 00b74a884ff88153dfc36b11fca6dd3779638f16 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:05:35 -0800 Subject: [PATCH 3/3] chore: bump dependencies --- .github/workflows/ci_tests.yaml | 22 -------------- test/upstream-requirements-py311.txt | 8 +++--- test/upstream-requirements-py37.txt | 43 ---------------------------- test/upstream.md | 7 +++++ tox.ini | 20 +------------ 5 files changed, 12 insertions(+), 88 deletions(-) delete mode 100644 test/upstream-requirements-py37.txt create mode 100644 test/upstream.md diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index f4fddb65..7d78de07 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -52,28 +52,6 @@ jobs: TOXENV: ${{ matrix.category }} run: tox -- -vv - upstream-py3: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - category: - - nocmk - - sourcebuildcheck - - 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: diff --git a/test/upstream-requirements-py311.txt b/test/upstream-requirements-py311.txt index 8fbdb995..dce81673 100644 --- a/test/upstream-requirements-py311.txt +++ b/test/upstream-requirements-py311.txt @@ -5,12 +5,12 @@ certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.0.1 coverage==7.1.0 -cryptography==41.0.6 +cryptography==42.0.4 execnet==1.9.0 hypothesis==6.31.6 idna==3.4 iniconfig==2.0.0 -Jinja2==3.1.2 +Jinja2==3.1.3 jmespath==0.10.0 MarkupSafe==2.1.2 mock==4.0.3 @@ -33,6 +33,6 @@ six==1.16.0 sortedcontainers==2.4.0 toml==0.10.2 types-toml==0.10.8.5 -urllib3==1.26.14 -Werkzeug==2.2.3 +urllib3==1.26.18 +Werkzeug==2.3.8 xmltodict==0.13.0 diff --git a/test/upstream-requirements-py37.txt b/test/upstream-requirements-py37.txt deleted file mode 100644 index 9fe9ad6f..00000000 --- a/test/upstream-requirements-py37.txt +++ /dev/null @@ -1,43 +0,0 @@ -attrs==22.2.0 -boto3==1.20.51 -botocore==1.23.51 -certifi==2023.7.22 -cffi==1.15.1 -charset-normalizer==3.0.1 -coverage==7.1.0 -cryptography==41.0.6 -exceptiongroup==1.1.0 -execnet==1.9.0 -hypothesis==6.31.6 -idna==3.4 -importlib-metadata==6.0.0 -iniconfig==2.0.0 -Jinja2==3.1.2 -jmespath==0.10.0 -MarkupSafe==2.1.2 -mock==4.0.3 -moto==3.0.2 -packaging==23.0 -pluggy==1.0.0 -py==1.11.0 -pycparser==2.21 -pytest==7.2.1 -pytest-cov==3.0.0 -pytest-forked==1.6.0 -pytest-mock==3.10.0 -pytest-xdist==3.2.0 -python-dateutil==2.8.2 -pytz==2022.7.1 -requests==2.31.0 -responses==0.22.0 -s3transfer==0.5.2 -six==1.16.0 -sortedcontainers==2.4.0 -toml==0.10.2 -tomli==2.0.1 -types-toml==0.10.8.5 -typing_extensions==4.5.0 -urllib3==1.26.14 -Werkzeug==2.2.3 -xmltodict==0.13.0 -zipp==3.14.0 diff --git a/test/upstream.md b/test/upstream.md new file mode 100644 index 00000000..aeb3ed63 --- /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 3c8733a2..07a0aed6 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = docs, bandit, doc8, readme, flake8{,-tests,-examples}, pylint{,-tests,-examples}, vulture, - test-upstream-requirements-py3{11,7} + test-upstream-requirements-py3{11} # Additional environments: # @@ -119,15 +119,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 @@ -144,15 +135,6 @@ recreate = True passenv = commands = {[testenv:base-command]commands} -m "local and not slow and not veryslow and not nope" --ignore=examples -# Test frozen upstream requirements for Python 3.7 -[testenv:test-upstream-requirements-py37] -basepython = python3.7 -passenv = -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