diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-03 18:54:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 18:54:49 +0100 |
| commit | dd76e5ca62aab87fb2d9f7dd10c3f3ee7e55279e (patch) | |
| tree | 5808003541998abc2ed7184518f34fb81b043d4c | |
| parent | changelog tweaks (diff) | |
| parent | changelog (diff) | |
| download | synapse-dd76e5ca62aab87fb2d9f7dd10c3f3ee7e55279e.tar.xz | |
Merge pull request #5135 from matrix-org/rav/build_fixes
Build fixes
| -rw-r--r-- | changelog.d/5135.misc | 1 | ||||
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 3 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/changelog.d/5135.misc b/changelog.d/5135.misc new file mode 100644 index 0000000000..eab06dd91d --- /dev/null +++ b/changelog.d/5135.misc @@ -0,0 +1 @@ +Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. \ No newline at end of file diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index 224c92352d..3de032cf8c 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -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 / diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff4d..c75119a030 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -69,6 +69,14 @@ REQUIREMENTS = [ "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 = { |