From 2e31dd2ad3bdb67a2b66ad1227110c1c29a1add6 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 24 Aug 2015 17:17:31 +0100
Subject: Add tox.ini file for synapse

---
 setup.py | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 16ccc0f1b8..8ad20df7cb 100755
--- a/setup.py
+++ b/setup.py
@@ -47,11 +47,6 @@ setup(
     packages=find_packages(exclude=["tests", "tests.*"]),
     description="Reference Synapse Home Server",
     install_requires=dependencies['requirements'](include_conditional=True).keys(),
-    setup_requires=[
-        "Twisted>=15.1.0", # Here to override setuptools_trial's dependency on Twisted>=2.4.0
-        "setuptools_trial",
-        "mock"
-    ],
     dependency_links=dependencies["DEPENDENCY_LINKS"],
     include_package_data=True,
     zip_safe=False,
-- 
cgit 1.4.1