Merge pull request #247 from matrix-org/markjh/tox

Add a tox.ini config for synapse.
This commit is contained in:
Mark Haines 2015-08-25 16:03:55 +01:00
commit 1925a38f95
4 changed files with 38 additions and 8 deletions

1
.gitignore vendored
View File

@ -42,3 +42,4 @@ build/
localhost-800*/ localhost-800*/
static/client/register/register_config.js static/client/register/register_config.js
.tox

View File

@ -3,13 +3,20 @@ include LICENSE
include VERSION include VERSION
include *.rst include *.rst
include demo/README 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 *.sql
recursive-include synapse/storage/schema *.py recursive-include synapse/storage/schema *.py
recursive-include demo *.dh
recursive-include demo *.py
recursive-include demo *.sh
recursive-include docs * recursive-include docs *
recursive-include scripts * recursive-include scripts *
recursive-include scripts-dev *
recursive-include tests *.py recursive-include tests *.py
recursive-include static *.css
recursive-include static *.html
recursive-include static *.js
prune demo/etc

View File

@ -47,11 +47,6 @@ setup(
packages=find_packages(exclude=["tests", "tests.*"]), packages=find_packages(exclude=["tests", "tests.*"]),
description="Reference Synapse Home Server", description="Reference Synapse Home Server",
install_requires=dependencies['requirements'](include_conditional=True).keys(), 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"], dependency_links=dependencies["DEPENDENCY_LINKS"],
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,

27
tox.ini Normal file
View File

@ -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