diff options
| author | Dan Callahan <danc@element.io> | 2021-01-29 14:56:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 14:56:04 +0000 |
| commit | e19396d62241c5619051e5aa15c9f53e2568fa45 (patch) | |
| tree | e22fa79e3815d1ea2f596628bd3730d0086274a2 | |
| parent | Fix typo in UPGRADE.rst (diff) | |
| download | synapse-e19396d62241c5619051e5aa15c9f53e2568fa45.tar.xz | |
Fix Debian builds on Xenial (#9254)
Adds note about updating dh-virtualenv once we drop support for Xenial. We can't update now, because it needs debhelper 12, while Xenial only backports 10. Signed-off-by: Dan Callahan <danc@element.io>
| -rw-r--r-- | changelog.d/9254.misc | 1 | ||||
| -rwxr-xr-x | debian/build_virtualenv | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/changelog.d/9254.misc b/changelog.d/9254.misc new file mode 100644 index 0000000000..b79b9abbd3 --- /dev/null +++ b/changelog.d/9254.misc @@ -0,0 +1 @@ +Fix Debian package building on Ubuntu 16.04 LTS (Xenial). diff --git a/debian/build_virtualenv b/debian/build_virtualenv index cbdde93f96..cf19084a9f 100755 --- a/debian/build_virtualenv +++ b/debian/build_virtualenv @@ -33,11 +33,13 @@ esac # Use --builtin-venv to use the better `venv` module from CPython 3.4+ rather # than the 2/3 compatible `virtualenv`. +# Pin pip to 20.3.4 to fix breakage in 21.0 on py3.5 (xenial) + dh_virtualenv \ --install-suffix "matrix-synapse" \ --builtin-venv \ --python "$SNAKE" \ - --upgrade-pip \ + --upgrade-pip-to="20.3.4" \ --preinstall="lxml" \ --preinstall="mock" \ --extra-pip-arg="--no-cache-dir" \ diff --git a/debian/changelog b/debian/changelog index 57bab70a34..1a421a85bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.26.0+nmu1) UNRELEASED; urgency=medium + + * Fix build on Ubuntu 16.04 LTS (Xenial). + + -- Dan Callahan <danc@element.io> Thu, 28 Jan 2021 16:21:03 +0000 + matrix-synapse-py3 (1.26.0) stable; urgency=medium [ Richard van der Hoff ] diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index e529293803..0d74630370 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -27,6 +27,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \ wget # fetch and unpack the package +# TODO: Upgrade to 1.2.2 once xenial is dropped RUN mkdir /dh-virtualenv RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/spotify/dh-virtualenv/archive/ac6e1b1.tar.gz RUN tar -xv --strip-components=1 -C /dh-virtualenv -f /dh-virtualenv.tar.gz |