diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 16:03:55 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 16:03:55 +0100 |
| commit | 1925a38f952a9823dd770e2e6f78f0b4259ea6cb (patch) | |
| tree | 1c894605ea4fb2c3f7035b96605b1e940c451ca9 /setup.py | |
| parent | Merge pull request #243 from matrix-org/markjh/remove_syutil (diff) | |
| parent | Add .tox to .gitignore (diff) | |
| download | synapse-1925a38f952a9823dd770e2e6f78f0b4259ea6cb.tar.xz | |
Merge pull request #247 from matrix-org/markjh/tox
Add a tox.ini config for synapse.
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 5 |
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, |