diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-13 11:39:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-13 11:39:38 +0100 |
| commit | c044aca1fdcdd7a5c8a16ef709e961c141909004 (patch) | |
| tree | 38ebba516ceef2be2a37be9a67a76d74f2739cf9 /setup.py | |
| parent | Comment (diff) | |
| parent | Add some metrics about the reactor (diff) | |
| download | synapse-c044aca1fdcdd7a5c8a16ef709e961c141909004.tar.xz | |
Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py index f9929591e7..16ccc0f1b8 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.1.0", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 "setuptools_trial", "mock" ], |