Skip to content

Commit 2a7fe12

Browse files
authored
chore: bump dependencies (#763)
1 parent 197d7f8 commit 2a7fe12

7 files changed

+19
-96
lines changed

Diff for: .github/workflows/ci_static-analysis.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
category:
1818
# Disabled pending completion of integration
1919
# https://github.com/aws/aws-dynamodb-encryption-python/issues/66
20-
# - mypy-py2
2120
# - mypy-py3
2221
- bandit
2322
- doc8
@@ -31,8 +30,8 @@ jobs:
3130
- pylint-examples
3231
- black-check
3332
steps:
34-
- uses: actions/checkout@v3
35-
- uses: actions/setup-python@v4
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-python@v5
3635
with:
3736
python-version: 3.8
3837
- run: |

Diff for: .github/workflows/ci_tests.yaml

+4-26
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
# - integ-slow
4040
# - examples
4141
steps:
42-
- uses: actions/checkout@v3
43-
- uses: actions/setup-python@v4
42+
- uses: actions/checkout@v4
43+
- uses: actions/setup-python@v5
4444
with:
4545
python-version: ${{ matrix.python }}
4646
architecture: ${{ matrix.platform.architecture }}
@@ -52,28 +52,6 @@ jobs:
5252
TOXENV: ${{ matrix.category }}
5353
run: tox -- -vv
5454

55-
upstream-py3:
56-
runs-on: ubuntu-latest
57-
strategy:
58-
fail-fast: true
59-
matrix:
60-
category:
61-
- nocmk
62-
- sourcebuildcheck
63-
- test-upstream-requirements-py37
64-
steps:
65-
- uses: actions/checkout@v3
66-
- uses: actions/setup-python@v4
67-
with:
68-
python-version: 3.7
69-
- run: |
70-
python -m pip install --upgrade pip
71-
pip install --upgrade -r dev_requirements/ci-requirements.txt
72-
- name: run test
73-
env:
74-
TOXENV: ${{ matrix.category }}
75-
run: tox -- -vv
76-
7755
upstream-py311:
7856
runs-on: ubuntu-latest
7957
strategy:
@@ -84,8 +62,8 @@ jobs:
8462
- sourcebuildcheck
8563
- test-upstream-requirements-py311
8664
steps:
87-
- uses: actions/checkout@v3
88-
- uses: actions/setup-python@v4
65+
- uses: actions/checkout@v4
66+
- uses: actions/setup-python@v5
8967
with:
9068
python-version: "3.11"
9169
- run: |

Diff for: .github/workflows/repo-sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
environment: repo-sync
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- uses: repo-sync/github-sync@v2
1414
name: Sync repo to branch
1515
with:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ certifi==2023.7.22
55
cffi==1.15.1
66
charset-normalizer==3.0.1
77
coverage==7.1.0
8-
cryptography==41.0.6
8+
cryptography==42.0.4
99
execnet==1.9.0
1010
hypothesis==6.31.6
1111
idna==3.4
1212
iniconfig==2.0.0
13-
Jinja2==3.1.2
13+
Jinja2==3.1.3
1414
jmespath==0.10.0
1515
MarkupSafe==2.1.2
1616
mock==4.0.3
@@ -33,6 +33,6 @@ six==1.16.0
3333
sortedcontainers==2.4.0
3434
toml==0.10.2
3535
types-toml==0.10.8.5
36-
urllib3==1.26.14
37-
Werkzeug==2.2.3
36+
urllib3==1.26.18
37+
Werkzeug==2.3.8
3838
xmltodict==0.13.0

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

-43
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

+1-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ envlist =
55
docs, bandit, doc8, readme,
66
flake8{,-tests,-examples}, pylint{,-tests,-examples},
77
vulture,
8-
test-upstream-requirements-py3{11,7}
8+
test-upstream-requirements-py3{11}
99

1010
# Additional environments:
1111
#
@@ -119,15 +119,6 @@ recreate = True
119119
deps =
120120
commands = {toxinidir}/test/freeze-upstream-requirements.sh
121121

122-
# Freeze for Python 3.7
123-
[testenv:freeze-upstream-requirements-py37]
124-
basepython = python3.7
125-
sitepackages = {[testenv:freeze-upstream-requirements-base]sitepackages}
126-
skip_install = {[testenv:freeze-upstream-requirements-base]skip_install}
127-
recreate = {[testenv:freeze-upstream-requirements-base]recreate}
128-
deps = {[testenv:freeze-upstream-requirements-base]deps}
129-
commands = {[testenv:freeze-upstream-requirements-base]commands} test/upstream-requirements-py37.txt
130-
131122
# Freeze for Python 3.11
132123
[testenv:freeze-upstream-requirements-py311]
133124
basepython = python3.11
@@ -144,15 +135,6 @@ recreate = True
144135
passenv =
145136
commands = {[testenv:base-command]commands} -m "local and not slow and not veryslow and not nope" --ignore=examples
146137

147-
# Test frozen upstream requirements for Python 3.7
148-
[testenv:test-upstream-requirements-py37]
149-
basepython = python3.7
150-
passenv =
151-
deps = -rtest/upstream-requirements-py37.txt
152-
sitepackages = {[testenv:test-upstream-requirements-base]sitepackages}
153-
recreate = {[testenv:test-upstream-requirements-base]recreate}
154-
commands = {[testenv:test-upstream-requirements-base]commands}
155-
156138
# Test frozen upstream requirements for Python 3.11
157139
[testenv:test-upstream-requirements-py311]
158140
basepython = python3.11

0 commit comments

Comments
 (0)