summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-07-07 10:46:59 +1000
committerGitHub <noreply@github.com>2018-07-07 10:46:59 +1000
commite845fd41c2743001558cce00b83e53a5ae300905 (patch)
treea94595e0bfeeaa3827b75c41ab4d7fa4c0f03d38
parentMerge tag 'v0.32.1' (diff)
downloadsynapse-e845fd41c2743001558cce00b83e53a5ae300905.tar.xz
Correct attrs package name in requirements (#3492)
-rw-r--r--changelog.d/.gitignore1
-rw-r--r--changelog.d/3492.bugfix1
-rw-r--r--synapse/python_dependencies.py2
3 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/.gitignore b/changelog.d/.gitignore
new file mode 100644
index 0000000000..f935021a8f
--- /dev/null
+++ b/changelog.d/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/changelog.d/3492.bugfix b/changelog.d/3492.bugfix
new file mode 100644
index 0000000000..a287a945bd
--- /dev/null
+++ b/changelog.d/3492.bugfix
@@ -0,0 +1 @@
+Amend the Python dependencies to depend on attrs from PyPI, not attr
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 7632dd50b7..987eec3ef2 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -57,7 +57,7 @@ REQUIREMENTS = {
     "phonenumbers>=8.2.0": ["phonenumbers"],
     "six": ["six"],
     "prometheus_client": ["prometheus_client"],
-    "attr": ["attr"],
+    "attrs": ["attr"],
     "netaddr>=0.7.18": ["netaddr"],
 }