mirrors/synapse
mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2025-03-31 03:45:13 +00:00
Code Activity

Merge pull request #5135 from matrix-org/rav/build_fixes

Browse source 
Build fixes
This commit is contained in:
Richard van der Hoff 2019-05-03 18:54:49 +01:00 • committed by GitHub
commit dd76e5ca62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5135.misc Normal file
View file

@ -0,0 +1 @@
Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`.

3
docker/Dockerfile-dhvirtualenv
View file

@ -55,7 +55,8 @@ RUN apt-get update -qq -o Acquire::Languages=none \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-venv \ python3-venv \
sqlite3 sqlite3 \
libpq-dev
COPY --from=builder /dh-virtualenv_1.1-1_all.deb / COPY --from=builder /dh-virtualenv_1.1-1_all.deb /

8
synapse/python_dependencies.py
View file

@ -69,6 +69,14 @@ REQUIREMENTS = [
"attrs>=17.4.0", "attrs>=17.4.0",
"netaddr>=0.7.18", "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 = { CONDITIONAL_REQUIREMENTS = {