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

Debian packaging via dh_virtualenv #4285

Merged
merged 41 commits into from
Dec 20, 2018
Merged

Debian packaging via dh_virtualenv #4285

merged 41 commits into from
Dec 20, 2018

Conversation

hawkowl
Copy link
Contributor

@hawkowl hawkowl commented Dec 10, 2018

No description provided.

@codecov-io
Copy link

codecov-io commented Dec 10, 2018

Codecov Report

Merging #4285 into debian will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           debian    #4285      +/-   ##
==========================================
+ Coverage   66.53%   66.56%   +0.03%     
==========================================
  Files         302      302              
  Lines       29919    29895      -24     
  Branches     4900     4893       -7     
==========================================
- Hits        19906    19900       -6     
+ Misses       8563     8550      -13     
+ Partials     1450     1445       -5
Impacted Files Coverage Δ
synapse/handlers/register.py 56.1% <0%> (-0.2%) ⬇️
synapse/api/auth.py 77.39% <0%> (-0.07%) ⬇️
synapse/handlers/search.py 76.54% <0%> (ø) ⬆️
synapse/_scripts/register_new_matrix_user.py 0% <0%> (ø) ⬆️
synapse/api/constants.py 100% <0%> (ø) ⬆️
synapse/handlers/federation.py 61.62% <0%> (ø) ⬆️
synapse/handlers/user_directory.py 70.42% <0%> (+0.24%) ⬆️
synapse/handlers/presence.py 76.26% <0%> (+0.4%) ⬆️
synapse/rest/client/v1/admin.py 62.79% <0%> (+0.79%) ⬆️
synapse/storage/monthly_active_users.py 36.36% <0%> (+1.95%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 672744c...57cea1c. Read the comment docs.

@richvdh
Copy link
Member

richvdh commented Dec 10, 2018

Context for interested readers: this PR is based on a branch which copies the existing packaging from https://github.com/matrix-org/package-synapse-debian/tree/debian/debian. It supercedes #4212 and matrix-org/package-synapse-debian#39.

The idea for now is that, because the changes here are a substantial rewrite, we will keep the existing python 2 packaging (in https://github.com/matrix-org/package-synapse-debian), and offer the packages built from this source as alternatives for those wanting to try out python 3.

(at some point in the future the old python 2 packages will be deprecated and we'll do the debian package shenanigans to make these packages replace them.)

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

ok so lots of comments here which range from "nitpicky things about trailing NLs" to "I think you should do X" to "This may be entirely valid but I don't quite understand why we are doing it". I'll let you figure out which is which :)

debian/build_debian.sh Outdated Show resolved Hide resolved
debian/build_debian.sh Outdated Show resolved Hide resolved
debian/changelog Outdated Show resolved Hide resolved
debian/changelog Outdated Show resolved Hide resolved
debian/control Outdated Show resolved Hide resolved
docker/Dockerfile-dhvirtualenv Show resolved Hide resolved
docker/build_debian_packages.sh Outdated Show resolved Hide resolved
docker/build_debian_packages.sh Show resolved Hide resolved
docker/build_debian_packages.sh Outdated Show resolved Hide resolved
.dockerignore Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/install Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/control Show resolved Hide resolved
debian/control Outdated Show resolved Hide resolved
debian/control Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/control Show resolved Hide resolved
synapse/python_dependencies.py Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/matrix-synapse-py3.triggers Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
debian/control Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
docker/Dockerfile-dhvirtualenv Outdated Show resolved Hide resolved
debian/source/format Show resolved Hide resolved
debian/install Outdated
@@ -1,2 +1,3 @@
debian/homeserver.yaml etc/matrix-synapse
debian/log.yaml etc/matrix-synapse
debian/matrix-synapse.service lib/systemd/system
Copy link
Member

@richvdh richvdh Dec 12, 2018

Choose a reason for hiding this comment

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

fwiw we can do it the "right way" when we rename the package, I didn't find a way for dh_systemd to install it under a name that wasn't the package name. :/

I'm totally failing to follow your logic here. We aren't using dh_systemd* at all currently (because we are on debhelper compat 9, which doesn't enable it by default, and instead dh_installinit does the installation of the service file).

Either way, the solution is just to add a --name argument in the relevant override_dh_* sections.

debian/matrix-synapse.service Show resolved Hide resolved
debian/NEWS Outdated Show resolved Hide resolved
Copy link
Member

@uhoreg uhoreg left a comment

Choose a reason for hiding this comment

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

I just took a quick look and haven't tested it out, but it looks plausible.

debian/rules Outdated Show resolved Hide resolved
hawkowl and others added 19 commits December 20, 2018 11:25
So that the container build doesn't modify the original source
... so that dpkg-source generates a source package with the right name
so that we don't have to invoke sudo
... so that dput works right
the stdlib has distutils on stretch
... to avoid problems running the tests with -j
We're supposed to match the debhelper compat level with our debhelper
dependency. Xenial only has debhelper 9, so we should use that.

I think the reason for this is basically that compat level 10 was considered
unstable until debhelper 10 was released - basically we're getting some
experimental pre-alpha version of compat level 10 by asking for it in
xenial. It may be fine, or it may not. Let's play safe.
we don't really need these.
@richvdh richvdh force-pushed the hawkowl/dh_virtualenv-2 branch from f4dbe67 to f0176b6 Compare December 20, 2018 11:31
@richvdh richvdh merged commit f0176b6 into debian Dec 20, 2018
richvdh added a commit that referenced this pull request Dec 20, 2018
@hawkowl hawkowl deleted the hawkowl/dh_virtualenv-2 branch May 21, 2019 15:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants