Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Build fixes #5135

Merged
merged 3 commits into from
May 3, 2019
Merged

Build fixes #5135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3281d7
pin urllib3 to <1.25
richvdh May 3, 2019
ecc0967
Debian: we now need libpq-dev.
richvdh May 3, 2019
5485852
changelog
richvdh May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5135.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`.
3 changes: 2 additions & 1 deletion docker/Dockerfile-dhvirtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ RUN apt-get update -qq -o Acquire::Languages=none \
python3-pip \
python3-setuptools \
python3-venv \
sqlite3
sqlite3 \
libpq-dev

COPY --from=builder /dh-virtualenv_1.1-1_all.deb /

Expand Down
8 changes: 8 additions & 0 deletions synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
"attrs>=17.4.0",

"netaddr>=0.7.18",

# requests is a transitive dep of treq, and urlib3 is a transitive dep
# of requests, as well as of sentry-sdk.
#
# As of requests 2.21, requests does not yet support urllib3 1.25.
# (If we do not pin it here, pip will give us the latest urllib3
# due to the dep via sentry-sdk.)
"urllib3<1.25",
]

CONDITIONAL_REQUIREMENTS = {
Expand Down