Skip to content

Commit 155b80b

Browse files
committed
Resolve incompatible dependencies
Problem: Requests and requests-toolbelt had incompatible dependencies 2.30 and 0.10.1 when removing appengine support. Solution: Degrade requests to version 2.29. Upgrade to latest request is deferred until all other packages are also upgraded. Signed-off-by: Paul Hewlett <[email protected]>
1 parent f3a1970 commit 155b80b

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# code quality
44
autopep8~=2.0
5-
black[jupyter]~=23.1
5+
black[jupyter]~=23.3
66
coverage[toml]~=7.1
7-
pip-audit~=2.4
7+
pip-audit~=2.5
88
pycodestyle~=2.10
99
pylint~=2.17
1010
pyright~=1.1

requirements.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ backoff~=1.11
77
certifi
88
flatten-dict~=0.4
99
iso8601~=1.1
10-
Jinja2~=3.0
11-
pyaml-env~=1.1
12-
requests~=2.28
10+
Jinja2~=3.1
11+
pyaml-env~=1.2
12+
13+
# TODO: these 2 dependencies are interdependent. Underlying changes to the
14+
# urllib3 packages require they must both be upgraded to 2.30 and 1.0.0
15+
# respectively. This cannot be done just yet as other pacakages (such
16+
# as pip-audit) will break until all other python packages have also
17+
# moved to the new requests. For now we pin to 2.29...
18+
requests~=2.29.0
1319
requests-toolbelt~=0.10
1420
rfc3339~=6.2
1521
xmltodict~=0.13

0 commit comments

Comments
 (0)