diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-25 11:50:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:50:11 +0100 |
commit | 94133d7ce8ab8dca8b8f47c0f2666d59486884a5 (patch) | |
tree | d472d3d5530e45eee0c156a0446bf42da0a81288 /tox.ini | |
parent | Fix iteration of requests_missing_keys; list doesn't have .values() (diff) | |
parent | Fix logcontxt leak in keyclient (#2465) (diff) | |
download | synapse-94133d7ce8ab8dca8b8f47c0f2666d59486884a5.tar.xz |
Merge branch 'develop' into develop
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini index 39ad305360..f408defc8f 100644 --- a/tox.ini +++ b/tox.ini @@ -14,14 +14,38 @@ deps = setenv = PYTHONDONTWRITEBYTECODE = no_byte_code - # As of twisted 16.4, trial tries to import the tests as a package, which - # means it needs to be on the pythonpath. - PYTHONPATH = {toxinidir} + commands = - /bin/sh -c "find {toxinidir} -name '*.pyc' -delete ; coverage run {env:COVERAGE_OPTS:} --source={toxinidir}/synapse \ - {envbindir}/trial {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}" + /usr/bin/find "{toxinidir}" -name '*.pyc' -delete + coverage run {env:COVERAGE_OPTS:} --source="{toxinidir}/synapse" \ + "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:} {env:DUMP_COVERAGE_COMMAND:coverage report -m} +[testenv:py27] + +# As of twisted 16.4, trial tries to import the tests as a package (previously +# it loaded the files explicitly), which means they need to be on the +# pythonpath. Our sdist doesn't include the 'tests' package, so normally it +# doesn't work within the tox virtualenv. +# +# As a workaround, we tell tox to do install with 'pip -e', which just +# creates a symlink to the project directory instead of unpacking the sdist. +# +# (An alternative to this would be to set PYTHONPATH to include the project +# directory. Note two problems with this: +# +# - if you set it via `setenv`, then it is also set during the 'install' +# phase, which inhibits unpacking the sdist, so the virtualenv isn't +# useful for anything else without setting PYTHONPATH similarly. +# +# - `synapse` is also loaded from PYTHONPATH so even if you only set +# PYTHONPATH for the test phase, we're still running the tests against +# the working copy rather than the contents of the sdist. So frankly +# you might as well use -e in the first place. +# +# ) +usedevelop=true + [testenv:packaging] deps = check-manifest |