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

Commit

Permalink
Move pympler back into the all extras (#12652)
Browse files Browse the repository at this point in the history
* Move `pympler` back into the `all` extras

Undoes a change I made in #12381. I can't fully remember my reasoning,
but this changed the contents of the debian packages in a backwards
incompatible way. We're not aware of anyone who's been bitten by this,
but we still want to fix it.

To the reviewer: please be convinced that the debian packages will still
contain pympler after this change.

* Debian changelog entry to keep the linter happy
  • Loading branch information
David Robertson authored May 7, 2022
1 parent 051a1c3 commit 0ce2201
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
1 change: 1 addition & 0 deletions changelog.d/12652.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move `pympler` back in to the `all` extras.
1 change: 0 additions & 1 deletion debian/build_virtualenv
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ poetry export \
--extras all \
--extras test \
--extras systemd \
--extras cache_memory \
-o exported_requirements.txt
deactivate
rm -rf "$TEMP_VENV"
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
matrix-synapse-py3 (1.58.2) UNRELEASED; urgency=medium

* Adjust how the `exported-requirements.txt` file is generated as part of
the process of building these packages. This affects the package
maintainers only; end-users are unaffected.

-- Synapse Packaging team <packages@matrix.org> Fri, 06 May 2022 13:49:29 +0100

matrix-synapse-py3 (1.58.1) stable; urgency=medium

* Include python dependencies from the `systemd` and `cache_memory` extras package groups, which
Expand Down
4 changes: 2 additions & 2 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,11 @@ all = [
"jaeger-client", "opentracing",
# jwt
"pyjwt",
#redis
"txredisapi", "hiredis"
# redis
"txredisapi", "hiredis",
# cache_memory
"pympler",
# omitted:
# - cache_memory: this is an experimental option
# - test: it's useful to have this separate from dev deps in the olddeps job
# - systemd: this is a system-based requirement
]
Expand Down

0 comments on commit 0ce2201

Please sign in to comment.