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 | |
| 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.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | MANIFEST.in | 13 | ||||
| -rwxr-xr-x | setup.py | 5 | ||||
| -rw-r--r-- | tox.ini | 27 |
4 files changed, 38 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 960183a794..4c336b710d 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ build/ localhost-800*/ static/client/register/register_config.js +.tox diff --git a/MANIFEST.in b/MANIFEST.in index a9b543af82..621e34cb76 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,13 +3,20 @@ include LICENSE include VERSION include *.rst include demo/README +include demo/demo.tls.dh +include demo/*.py +include demo/*.sh recursive-include synapse/storage/schema *.sql recursive-include synapse/storage/schema *.py -recursive-include demo *.dh -recursive-include demo *.py -recursive-include demo *.sh recursive-include docs * recursive-include scripts * +recursive-include scripts-dev * recursive-include tests *.py + +recursive-include static *.css +recursive-include static *.html +recursive-include static *.js + +prune demo/etc 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, diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000000..58cf9613cb --- /dev/null +++ b/tox.ini @@ -0,0 +1,27 @@ +[tox] +envlist = packaging, py27, pep8 + +[testenv] +deps = + coverage + Twisted>=15.1 + mock +setenv = + PYTHONDONTWRITEBYTECODE = no_byte_code +commands = + coverage run --source=./synapse {envbindir}/trial tests + coverage report -m +install_command = + pip install --process-dependency-links --pre {opts} {packages} + +[testenv:packaging] +deps = + check-manifest +commands = + check-manifest + +[testenv:pep8] +basepython = python2.7 +deps = + flake8 +commands = flake8 synapse |