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

Add explicit dependency on netaddr
release-v0.32.1
Richard van der Hoff 2018-07-06 16:39:56 +01:00 committed by GitHub
commit 2087d5d046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

1
changelog.d/3488.bugfix Normal file
View File

@ -0,0 +1 @@
Add explicit dependency on netaddr

View File

@ -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"],