summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-19 11:26:29 +0000
committerErik Johnston <erik@matrix.org>2015-03-19 11:26:29 +0000
commitb26d85c30f117fd3146d2701198d02596251ad49 (patch)
tree1e0d43bc0588a14a043a9afaceb58d4eeb2a8512 /setup.py
parentMerge branch 'release-v0.8.1' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-b26d85c30f117fd3146d2701198d02596251ad49.tar.xz
Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse v0.8.1-r1
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py

index 45943adb2c..ab24159be7 100755 --- a/setup.py +++ b/setup.py
@@ -45,7 +45,7 @@ setup( version=version, packages=find_packages(exclude=["tests", "tests.*"]), description="Reference Synapse Home Server", - install_requires=dependencies["REQUIREMENTS"].keys(), + install_requires=dependencies['requirements'](include_conditional=True).keys(), setup_requires=[ "Twisted==14.0.2", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 "setuptools_trial",