Merge pull request #3488 from matrix-org/rav/fix-netaddr-dep

Add explicit dependency on netaddr

2 files changed, 2 insertions, 3 deletions

diff --git a/changelog.d/3488.bugfix b/changelog.d/3488.bugfix
new file mode 100644

index 0000000000..de6fac05a5
--- /dev/null
+++ b/changelog.d/3488.bugfix
@@ -0,0 +1 @@
+Add explicit dependency on netaddr
\ No newline at end of file
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"],