Permalink
Browse files

make tox run the installed version, not ???

  • Loading branch information...
1 parent 2a623bc commit fb96f8475bd31d912d0ccd40f9091b24e9a38f6f @hawkowl hawkowl committed Oct 11, 2016
Showing with 31 additions and 18 deletions.
  1. +2 −1 .coveragerc
  2. +6 −10 .travis.yml
  3. +23 −7 tox.ini
View
@@ -3,12 +3,13 @@ omit =
crossbar/worker/test/examples/syntaxerror.py
branch = True
source = crossbar
+parallel = True
[paths]
source=
crossbar
.tox/*/lib/python*/site-packages/crossbar
- .tox/*/Lib/site-packages/crossbar
+ .tox/*/lib/site-packages/crossbar
.tox/pypy*/site-packages/crossbar
[report]
View
@@ -8,16 +8,12 @@ install:
env:
- TOX_ENV=flake8
- - TOX_ENV=py27-twtrunk-abtrunk
- - TOX_ENV=py27-twcurrent-abtrunk
+ - TOX_ENV=py27-twtrunk-abtrunk,coverage-report
+ - TOX_ENV=py27-twcurrent-abtrunk,coverage-report
#- TOX_ENV=py27-twcurrent-abcurrent
- - TOX_ENV=py33-twtrunk-abtrunk
- - TOX_ENV=py33-twcurrent-abtrunk
- #- TOX_ENV=py33-twcurrent-abcurrent
-
- - TOX_ENV=py34-twtrunk-abtrunk
- - TOX_ENV=py34-twcurrent-abtrunk
+ - TOX_ENV=py34-twtrunk-abtrunk,coverage-report
+ - TOX_ENV=py34-twcurrent-abtrunk,coverage-report
#- TOX_ENV=py34-twcurrent-abcurrent
# Travis needs to update it's PyPy
@@ -45,11 +41,11 @@ matrix:
include:
- python: 3.5
env:
- - TOX_ENV=py35-twtrunk-abtrunk
+ - TOX_ENV=py35-twtrunk-abtrunk,coverage-report
- python: 3.5
env:
- - TOX_ENV=py35-twcurrent-abtrunk
+ - TOX_ENV=py35-twcurrent-abtrunk,coverage-report
# - python: 3.5
# env:
View
@@ -12,9 +12,28 @@ commands =
flake8 --ignore=E402,F405,E501,E731,N801,N802,N803,N805,N806 crossbar
basepython = python2.7
+[testenv:coverage-erase]
+skip_install = True
+changedir={toxinidir}
+deps =
+ coverage
+commands=
+ coverage erase
+
+[testenv:coverage-report]
+skip_install = True
+changedir={toxinidir}
+deps =
+ coverage
+commands=
+ coverage combine
+ coverage report
+ coverage html
+
[testenv]
whitelist_externals = sh
+changedir=tests
deps =
#pypy: cryptography<1.0
#pypy: pynacl<1.0
@@ -34,14 +53,11 @@ commands =
coverage --version
{envbindir}/trial --version
#{py27,py33,py34,py35,pypy}: pip install .
- {py27,py33,py34,py35,pypy}: pip install --ignore-installed --require-hashes -r requirements.txt
- coverage erase
- coverage run -m twisted.trial {posargs:crossbar}
- coverage combine --append
- coverage report
- coverage html
+ {py27,py33,py34,py35,pypy}: pip install -r {toxinidir}/requirements-in.txt
+ coverage run --rcfile={toxinidir}/.coveragerc -m twisted.trial {posargs:crossbar}
setenv =
- COVERAGE_PROCESS_START = .coveragerc
+ COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
+ COVERAGE_FILE = {toxinidir}/.coverage
#LMDB_FORCE_CFFI=1
#SODIUM_INSTALL=bundled
{py27,py33,py34,py35}: CB_FULLTESTS = 1

0 comments on commit fb96f84

Please sign in to comment.