Merge commit '96bc110a6' into dinsic

* commit '96bc110a6':
  Require parameterized package version to be at least 0.7.0. (#7680)

2 files changed, 3 insertions, 1 deletions

diff --git a/changelog.d/7680.misc b/changelog.d/7680.misc
new file mode 100644

index 0000000000..46cd232574
--- /dev/null
+++ b/changelog.d/7680.misc
@@ -0,0 +1 @@
+Require `parameterized` package version to be at least 0.7.0.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index d655aba35c..92d3709ae3 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -93,7 +93,8 @@ CONDITIONAL_REQUIREMENTS = {
     "oidc": ["authlib>=0.14.0"],
     "systemd": ["systemd-python>=231"],
     "url_preview": ["lxml>=3.5.0"],
-    "test": ["mock>=2.0", "parameterized"],
+    # parameterized_class decorator was introduced in parameterized 0.7.0
+    "test": ["mock>=2.0", "parameterized>=0.7.0"],
     "sentry": ["sentry-sdk>=0.7.2"],
     "opentracing": ["jaeger-client>=4.0.0", "opentracing>=2.2.0"],
     "jwt": ["pyjwt>=1.6.4"],