summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-06 16:39:56 +0100
committerGitHub <noreply@github.com>2018-07-06 16:39:56 +0100
commit2087d5d046d89d7885f3cf3742acf78ce3f71365 (patch)
tree161eaafbbd96e0da209304be397496659d622e58 /synapse/python_dependencies.py
parent0.32.0 version bump, update changelog (diff)
parentAdd explicit dependency on netaddr (diff)
downloadsynapse-2087d5d046d89d7885f3cf3742acf78ce3f71365.tar.xz
Merge pull request #3488 from matrix-org/rav/fix-netaddr-dep
Add explicit dependency on netaddr
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index faf6dfdb8d..7632dd50b7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -58,15 +58,13 @@ REQUIREMENTS = { "six": ["six"], "prometheus_client": ["prometheus_client"], "attr": ["attr"], + "netaddr>=0.7.18": ["netaddr"], } CONDITIONAL_REQUIREMENTS = { "web_client": { "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], }, - "preview_url": { - "netaddr>=0.7.18": ["netaddr"], - }, "email.enable_notifs": { "Jinja2>=2.8": ["Jinja2>=2.8"], "bleach>=1.4.2": ["bleach>=1.4.2"],