summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 23:54:53 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 23:55:35 +0000
commit559a26b025133bd36016ab8314f8d92b52d20e25 (patch)
tree72825ab052ae3f3f70bab11e0ec42b6b429c60e4 /setup.py
parentMerge pull request #48 from matrix-org/hotfixes-v0.6.1e (diff)
downloadsynapse-559a26b025133bd36016ab8314f8d92b52d20e25.tar.xz
Pin the twisted version so that it doesn't pull in twisted 15. v0.6.1e
Diffstat (limited to '')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index bde26c0b97..28e8188f94 100755
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ setup(
         "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1",
     ],
     setup_requires=[
-        "Twisted==14.0.2",
+        "Twisted==14.0.2", # Here to override setuptools_trial's dependency on Twisted>=2.4.0
         "setuptools_trial",
         "setuptools>=1.0.0", # Needs setuptools that supports git+ssh.
                              # TODO: Do we need this now? we don't use git+ssh.