From 1464a0578a85b15459132f2b2150e5322498b3d0 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 6 Jul 2018 16:27:17 +0100
Subject: [PATCH] Add explicit dependency on netaddr

the dependencies file, causing failures on upgrade (and presumably for new
installs).
---
 changelog.d/3488.bugfix        | 1 +
 synapse/python_dependencies.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/3488.bugfix

diff --git a/changelog.d/3488.bugfix b/changelog.d/3488.bugfix
new file mode 100644
index 000000000..de6fac05a
--- /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 faf6dfdb8..7632dd50b 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"],