summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-24 17:17:31 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-25 14:14:02 +0100
commit2e31dd2ad3bdb67a2b66ad1227110c1c29a1add6 (patch)
treeb850768807bae8c58e8c20c0e885a5b912e67d6a /setup.py
parentMerge pull request #243 from matrix-org/markjh/remove_syutil (diff)
downloadsynapse-2e31dd2ad3bdb67a2b66ad1227110c1c29a1add6.tar.xz
Add tox.ini file for synapse
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py5
1 files changed, 0 insertions, 5 deletions
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,