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

Commit 0ce2201

Browse files
author
David Robertson
authored
Move pympler back into the all extras (#12652)
* 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
1 parent 051a1c3 commit 0ce2201

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

changelog.d/12652.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move `pympler` back in to the `all` extras.

debian/build_virtualenv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ poetry export \
4141
--extras all \
4242
--extras test \
4343
--extras systemd \
44-
--extras cache_memory \
4544
-o exported_requirements.txt
4645
deactivate
4746
rm -rf "$TEMP_VENV"

debian/changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
matrix-synapse-py3 (1.58.2) UNRELEASED; urgency=medium
2+
3+
* Adjust how the `exported-requirements.txt` file is generated as part of
4+
the process of building these packages. This affects the package
5+
maintainers only; end-users are unaffected.
6+
7+
-- Synapse Packaging team <[email protected]> Fri, 06 May 2022 13:49:29 +0100
8+
19
matrix-synapse-py3 (1.58.1) stable; urgency=medium
210

311
* Include python dependencies from the `systemd` and `cache_memory` extras package groups, which

poetry.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,11 @@ all = [
231231
"jaeger-client", "opentracing",
232232
# jwt
233233
"pyjwt",
234-
#redis
235-
"txredisapi", "hiredis"
234+
# redis
235+
"txredisapi", "hiredis",
236+
# cache_memory
237+
"pympler",
236238
# omitted:
237-
# - cache_memory: this is an experimental option
238239
# - test: it's useful to have this separate from dev deps in the olddeps job
239240
# - systemd: this is a system-based requirement
240241
]

0 commit comments

Comments
 (0)