From 9ccfdfcd7cc15f5c944670e6b6bcfe74090763f1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 30 Jan 2015 17:15:39 +0000
Subject: Add twisted to setup requires so it gets processed before
 setuptools_trial

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index abccca0f2c..eb1d17c25f 100755
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ setup(
         "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.0/#egg=matrix_angular_sdk-0.6.0",
     ],
     setup_requires=[
+        "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.
-- 
cgit 1.4.1