Skip to content

Commit a93ffe7

Browse files
authored
chore: bump deps & document upstream test (aws#646)
* chore: bump deps & document upstream test * chore: remove upstream py37 from GHW
1 parent e5c331b commit a93ffe7

7 files changed

+11
-66
lines changed

Diff for: .github/workflows/ci_test-vector-handler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- os: macos-latest
3838
architecture: x86
3939
steps:
40-
- uses: aws-actions/configure-aws-credentials@v1
40+
- uses: aws-actions/configure-aws-credentials@v4
4141
with:
4242
aws-access-key-id: ${{ secrets.INTEG_AWS_ACCESS_KEY_ID }}
4343
aws-secret-access-key: ${{ secrets.INTEG_AWS_SECRET_ACCESS_KEY }}

Diff for: .github/workflows/ci_tests.yaml

-20
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,6 @@ jobs:
6464
env:
6565
TOXENV: ${{ matrix.category }}
6666
run: tox -- -vv
67-
upstream-py37:
68-
runs-on: ubuntu-latest
69-
strategy:
70-
fail-fast: true
71-
matrix:
72-
category:
73-
- nocmk
74-
- test-upstream-requirements-py37
75-
steps:
76-
- uses: actions/checkout@v4
77-
- uses: actions/setup-python@v4
78-
with:
79-
python-version: 3.7
80-
- run: |
81-
python -m pip install --upgrade pip
82-
pip install --upgrade -r dev_requirements/ci-requirements.txt
83-
- name: run test
84-
env:
85-
TOXENV: ${{ matrix.category }}
86-
run: tox -- -vv
8767
upstream-py311:
8868
runs-on: ubuntu-latest
8969
strategy:

Diff for: dev_requirements/linter-requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bandit==1.7.4
2-
black==22.3.0
2+
black==24.2.0
33
doc8==0.10.1
44
flake8==4.0.1
55
flake8-bugbear==22.9.11
@@ -10,4 +10,4 @@ pyflakes==2.4.0
1010
pylint==2.13.5
1111
readme_renderer==37.3
1212
seed-isort-config==2.2.0
13-
vulture==2.6
13+
vulture==2.9.1

Diff for: test/upstream-requirements-py311.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ boto3==1.26.54
33
botocore==1.29.54
44
cffi==1.15.1
55
coverage==7.0.5
6-
cryptography==41.0.6
6+
cryptography==42.0.4
77
iniconfig==2.0.0
88
jmespath==1.0.1
99
mock==4.0.3

Diff for: test/upstream-requirements-py37.txt

-25
This file was deleted.

Diff for: test/upstream.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
AWS Crypto Tools maintains `test/upstream-requirements-py<VERSION>.txt` in our Python products such that
2+
our Cryptographic Primitive Provider for Python ([pyca/cryptography](https://github.com/pyca/cryptography))
3+
may execute downstream tests against AWS Crypto Tools Python products.
4+
These files allow pyca to install and test the Crypto Tools products.
5+
Additionally, Crypto Tools should maintain a test configuration that can be completed without using any AWS resources.
6+
If Crypto Tools needs to contact pyca about this expectation,
7+
they should cut a issue to the pyca/cryptography repo.

Diff for: tox.ini

-17
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,6 @@ recreate = True
9494
deps =
9595
commands = {toxinidir}/test/freeze-upstream-requirements.sh
9696

97-
# Freeze for Python 3.7
98-
[testenv:freeze-upstream-requirements-py37]
99-
basepython = python3.7
100-
sitepackages = {[testenv:freeze-upstream-requirements-base]sitepackages}
101-
skip_install = {[testenv:freeze-upstream-requirements-base]skip_install}
102-
recreate = {[testenv:freeze-upstream-requirements-base]recreate}
103-
deps = {[testenv:freeze-upstream-requirements-base]deps}
104-
commands = {[testenv:freeze-upstream-requirements-base]commands} test/upstream-requirements-py37.txt
105-
10697
# Freeze for Python 3.11
10798
[testenv:freeze-upstream-requirements-py311]
10899
basepython = python3.11
@@ -118,14 +109,6 @@ sitepackages = False
118109
recreate = True
119110
commands = {[testenv:base-command]commands} test/ -m local
120111

121-
# Test frozen upstream requirements for Python 3.7
122-
[testenv:test-upstream-requirements-py37]
123-
basepython = python3.7
124-
deps = -rtest/upstream-requirements-py37.txt
125-
sitepackages = {[testenv:test-upstream-requirements-base]sitepackages}
126-
recreate = {[testenv:test-upstream-requirements-base]recreate}
127-
commands = {[testenv:test-upstream-requirements-base]commands}
128-
129112
# Test frozen upstream requirements for Python 3.11
130113
[testenv:test-upstream-requirements-py311]
131114
basepython = python3.11

0 commit comments

Comments
 (0)