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

Fix Debian builds on Xenial #9254

Merged
merged 1 commit into from
Jan 29, 2021
Merged

Fix Debian builds on Xenial #9254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/9254.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix Debian package building on Ubuntu 16.04 LTS (Xenial).
4 changes: 3 additions & 1 deletion debian/build_virtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth adding a note to say we can remove the new line after we drop xenial?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd leave it as is for now, if that's OK with you. The comment is there to ensure we pick it up when going through the post-Py3.5 purge checklist in #9131, specifically the "Grep source and docs for anything referencing Python 3.5, Stretch, or Xenial and excise it" bit :)

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" \
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ]
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile-dhvirtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down