summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-03-14 18:39:14 +0000
committerDavid Robertson <davidr@element.io>2022-03-14 18:41:58 +0000
commitc8faad496e71dfac108fb152e793ac8a305f2534 (patch)
treec6c9c6c4cfcd24b50fba1283906ce16bfc056573
parentAnd try to fix `export-data` (diff)
downloadsynapse-c8faad496e71dfac108fb152e793ac8a305f2534.tar.xz
Include `test` extra
I thought we might be able to get away without this and make it a dev
dependency only. But in olddeps it's easier to have this (otherwise I
have to worry about version conflicts between dev deps and the normal
deps).

lock the test extra
-rw-r--r--poetry.lock5
-rw-r--r--pyproject.toml3
2 files changed, 6 insertions, 2 deletions
diff --git a/poetry.lock b/poetry.lock
index 12ef218aea..242b0db2db 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -661,7 +661,7 @@ pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 name = "parameterized"
 version = "0.8.1"
 description = "Parameterized testing with any Python test framework"
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"
 
@@ -1576,12 +1576,13 @@ redis = ["txredisapi", "hiredis"]
 saml2 = ["pysaml2"]
 sentry = ["sentry-sdk"]
 systemd = ["systemd-python"]
+test = ["parameterized"]
 url_preview = ["lxml"]
 
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "568b9ec860636ec456031d3b424a67bf8de3121c292a81818a2f259757fe5236"
+content-hash = "1fc5da3d43f640c8d47885202257946e3bab7a83a987f192fefd29acb22e97e0"
 
 [metadata.files]
 appdirs = [
diff --git a/pyproject.toml b/pyproject.toml
index 2bfa3d1036..76ec58ef33 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -170,6 +170,7 @@ pyjwt = { version = ">=1.6.4", optional = true }
 txredisapi = { version = ">=1.4.7", optional = true }
 hiredis = { version = "*", optional = true }
 Pympler = { version = "*", optional = true }
+parameterized = { version = ">=0.7.0", optional = true }
 
 ## Developer dependencies should not get included in "all".
 ##
@@ -193,6 +194,7 @@ jwt = ["pyjwt"]
 redis = ["txredisapi", "hiredis"]
 # Required to use experimental `caches.track_memory_usage` config option.
 cache_memory = ["pympler"]
+test = ["parameterized"]
 
 # The duplication here is awful. I hate hate hate hate hate it. However, for now I want
 # to ensure you can still `pip install matrix-synapse[all]` like today. Two motivations:
@@ -226,6 +228,7 @@ all = [
     #redis
     "txredisapi", "hiredis"
     # cache_memory, omitted: this is an experimental option
+    # test, omitted: it's useful to have this separate from dev deps in the olddeps job
 ]
 
 [tool.poetry.dev-dependencies]