summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
committerErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
commit341c35614a9c46f2c03d69e7be1d33f0d21ae8ba (patch)
treefb6ab41d62e3d8fa9508bae9a71202b7b9d3ef6f /synapse/python_dependencies.py
parentMerge branch 'release-v0.99.0' into matrix-org-hotfixes (diff)
parentFixup changelog (diff)
downloadsynapse-341c35614a9c46f2c03d69e7be1d33f0d21ae8ba.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 756721e304..5d087ee26b 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -85,7 +85,7 @@ CONDITIONAL_REQUIREMENTS = { "saml2": ["pysaml2>=4.5.0"], "url_preview": ["lxml>=3.5.0"], - "test": ["mock>=2.0"], + "test": ["mock>=2.0", "parameterized"], }