summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-01-26 12:06:56 +0000
committerGitHub <noreply@github.com>2022-01-26 12:06:56 +0000
commitc5815567a40a3f50de24b73f9cf150c9b5dbfd42 (patch)
treeebe55775b1e6f8f7b8dfee20db51d21a76529cfc
parentAdd a config flag to inhibit `M_USER_IN_USE` during registration (#11743) (diff)
downloadsynapse-c5815567a40a3f50de24b73f9cf150c9b5dbfd42.tar.xz
Avoid type annotation problems in prom-client (#11834)
-rw-r--r--changelog.d/11834.misc1
-rw-r--r--synapse/python_dependencies.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/11834.misc b/changelog.d/11834.misc
new file mode 100644
index 0000000000..29a5635f7a
--- /dev/null
+++ b/changelog.d/11834.misc
@@ -0,0 +1 @@
+Workaround a type annotation problem in `prometheus_client` 0.13.0.
\ No newline at end of file
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 22b4606ae0..80786464c2 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -76,7 +76,8 @@ REQUIREMENTS = [
     "msgpack>=0.5.2",
     "phonenumbers>=8.2.0",
     # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
-    "prometheus_client>=0.4.0",
+    # 0.13.0 has an incorrect type annotation, see #11832.
+    "prometheus_client>=0.4.0,<0.13.0",
     # we use `order`, which arrived in attrs 19.2.0.
     # Note: 21.1.0 broke `/sync`, see #9936
     "attrs>=19.2.0,!=21.1.0",