summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-06-15 16:27:20 +0100
committerMark Haines <mark.haines@matrix.org>2015-06-15 16:27:20 +0100
commit66da8f60d057527fe74ff5790973d2865c980efb (patch)
tree193224671fb153dc5f2b0116b558ff26051ac983
parentMerge branch 'develop' into markjh/twisted-15 (diff)
downloadsynapse-66da8f60d057527fe74ff5790973d2865c980efb.tar.xz
Bump the version of twisted needed for setup_requires to 15.2.1
Diffstat (limited to '')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index f9929591e7..c790484c7a 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(
     description="Reference Synapse Home Server",
     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
+        "Twisted==15.2.1", # Here to override setuptools_trial's dependency on Twisted>=2.4.0
         "setuptools_trial",
         "mock"
     ],