summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kurz <okurz@suse.de>2020-07-06 11:21:41 +0200
committerGitHub <noreply@github.com>2020-07-06 10:21:41 +0100
commit4e118742ca310ce101bc794196e3270388e0e4e7 (patch)
tree5c6ba14fc95a606e8638fa949fc90783999aa753
parentisort 5 compatibility (#7786) (diff)
downloadsynapse-4e118742ca310ce101bc794196e3270388e0e4e7.tar.xz
Allow to use higher versions of prometheus_client (#7780)
Fixes https://github.com/matrix-org/synapse/issues/7641

The package was pinned to <0.8.0 without an obvious reasoning with
7ad1d7635
in https://github.com/matrix-org/synapse/pull/5636
while the version selection looks to just try to exclude an arbitrary
next minor version number that might introduce API breaking changes.
Selecting the next minor number might be a good conservative selection.

Downstream distributions already reported success patching out the version
requirements.

This also fixes the integration of upgraded packages into openSUSE packages,
e.g. for openSUSE Tumbleweed which already ships prometheus_client >= 0.8 .

Signed-off-by: Oliver Kurz <okurz@suse.de>

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to '')
-rw-r--r--changelog.d/7780.misc1
-rw-r--r--synapse/python_dependencies.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7780.misc b/changelog.d/7780.misc
new file mode 100644
index 0000000000..a627bea458
--- /dev/null
+++ b/changelog.d/7780.misc
@@ -0,0 +1 @@
+Allow to use higher versions of prometheus_client <0.9.0 which are expected to introduce no breaking changes. Contributed by Oliver Kurz.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index b1cac901eb..8cfcdb0573 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -66,7 +66,7 @@ REQUIREMENTS = [
     "pymacaroons>=0.13.0",
     "msgpack>=0.5.2",
     "phonenumbers>=8.2.0",
-    "prometheus_client>=0.0.18,<0.8.0",
+    "prometheus_client>=0.0.18,<0.9.0",
     # we use attr.validators.deep_iterable, which arrived in 19.1.0
     "attrs>=19.1.0",
     "netaddr>=0.7.18",