summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-11-15 16:53:34 +0000
committerGitHub <noreply@github.com>2016-11-15 16:53:34 +0000
commitdc6cede78e61784731b4af1acba5e6ae962c11fc (patch)
treeb0b23df5e7987df0425c91274e402c5d53ed1a42 /synapse/python_dependencies.py
parentMerge pull request #1617 from matrix-org/erikj/intern_state_dict (diff)
parentUse external ldap auth pacakge (diff)
downloadsynapse-dc6cede78e61784731b4af1acba5e6ae962c11fc.tar.xz
Merge pull request #1628 from matrix-org/erikj/ldap_split_out
Use external ldap auth pacakge
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index 59bc084b11..3742a25b37 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -49,8 +49,8 @@ CONDITIONAL_REQUIREMENTS = { "Jinja2>=2.8": ["Jinja2>=2.8"], "bleach>=1.4.2": ["bleach>=1.4.2"], }, - "ldap": { - "ldap3>=1.0": ["ldap3>=1.0"], + "matrix-synapse-ldap3": { + "matrix-synapse-ldap3>=0.1": ["ldap_auth_provider"], }, "psutil": { "psutil>=2.0.0": ["psutil>=2.0.0"],