diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-06 16:39:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 16:39:56 +0100 |
| commit | 2087d5d046d89d7885f3cf3742acf78ce3f71365 (patch) | |
| tree | 161eaafbbd96e0da209304be397496659d622e58 | |
| parent | 0.32.0 version bump, update changelog (diff) | |
| parent | Add explicit dependency on netaddr (diff) | |
| download | synapse-2087d5d046d89d7885f3cf3742acf78ce3f71365.tar.xz | |
Merge pull request #3488 from matrix-org/rav/fix-netaddr-dep
Add explicit dependency on netaddr
| -rw-r--r-- | changelog.d/3488.bugfix | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
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"], |