summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-12 17:25:13 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-12 17:25:13 +0100
commit21ac8be5f7be79cfffb32ad9fe1bba9515d9fd3e (patch)
treed74ba7516d2252947273a1d69577f3aa7aae974c
parentMerge branch 'develop' into markjh/twisted-15 (diff)
downloadsynapse-21ac8be5f7be79cfffb32ad9fe1bba9515d9fd3e.tar.xz
Depend on Twisted>=15.1 rather than pining to a particular version
-rwxr-xr-xsetup.py2
-rw-r--r--synapse/python_dependencies.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index c790484c7a..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==15.2.1", # 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"
     ],
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 534c4a6698..fa06480ad1 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 REQUIREMENTS = {
     "syutil>=0.0.7": ["syutil>=0.0.7"],
-    "Twisted==15.2.1": ["twisted==15.2.1"],
+    "Twisted>=15.1.0": ["twisted>=15.1.0"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],
     "pyopenssl>=0.14": ["OpenSSL>=0.14"],
     "pyyaml": ["yaml"],