Skip to content

Commit

Permalink
Resolve incompatible dependencies
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
eccles committed May 11, 2023
1 parent f3a1970 commit 155b80b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# code quality
autopep8~=2.0
black[jupyter]~=23.1
black[jupyter]~=23.3
coverage[toml]~=7.1
pip-audit~=2.4
pip-audit~=2.5
pycodestyle~=2.10
pylint~=2.17
pyright~=1.1
Expand Down
12 changes: 9 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ backoff~=1.11
certifi
flatten-dict~=0.4
iso8601~=1.1
Jinja2~=3.0
pyaml-env~=1.1
requests~=2.28
Jinja2~=3.1
pyaml-env~=1.2

# TODO: these 2 dependencies are interdependent. Underlying changes to the
# urllib3 packages require they must both be upgraded to 2.30 and 1.0.0
# respectively. This cannot be done just yet as other pacakages (such
# as pip-audit) will break until all other python packages have also
# moved to the new requests. For now we pin to 2.29...
requests~=2.29.0
requests-toolbelt~=0.10
rfc3339~=6.2
xmltodict~=0.13
Expand Down

0 comments on commit 155b80b

Please sign in to comment.