x/wsme
Code Issues Proposed changes

Fix tox configuration.

Browse Source 
-   Make sure tox-tmpl.ini and tox.ini are consistent

-   Avoid coverage 4.x

    Coverage 4.0a1 CLI is not happy with the commands we use in the unittests.
    Avoiding it for now.

Change-Id: I6976d4a94358692f5cb9570f672f6dd985f5d1b1
This commit is contained in:
Christophe de Vienne 2014-10-01 10:30:41 +02:00
parent 26a6acdadd
commit 2c29787386
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tox-tmpl.ini
View File

@ -5,12 +5,13 @@ envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,corn
[common] [common]
testtools= testtools=
nose nose
coverage coverage < 3.99
pbr pbr
webtest webtest
basedeps= basedeps=
transaction transaction
pecan pecan
cloud_sptheme
Sphinx Sphinx
Flask Flask
@ -64,7 +65,7 @@ deps =
https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
commands= commands=
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
@ -105,7 +106,7 @@ deps=
pbr pbr
nose nose
webtest < 1.4.99 webtest < 1.4.99
coverage coverage < 3.99
simplejson simplejson
suds suds
lxml lxml
@ -120,7 +121,7 @@ deps=
pbr pbr
nose nose
webtest < 1.4.99 webtest < 1.4.99
coverage coverage < 3.99
simplejson simplejson
suds suds
lxml lxml
@ -134,7 +135,7 @@ basepython=python2.6
deps= deps=
pbr pbr
nose nose
coverage coverage < 3.99
simplejson simplejson
commands= commands=
{envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest {envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
@ -150,7 +151,7 @@ deps=
pbr pbr
nose nose
webtest webtest
coverage coverage < 3.99
cornice cornice
commands= commands=
{envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs} {envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs}
@ -191,7 +192,7 @@ commands=
[testenv:coverage] [testenv:coverage]
basepython=python basepython=python
deps= deps=
coverage coverage < 3.99
setenv= setenv=
COVERAGE_FILE=.coverage COVERAGE_FILE=.coverage
commands= commands=

30
tox.ini
View File

@ -4,13 +4,13 @@ envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,corn
[common] [common]
testtools = testtools =
nose nose
coverage coverage < 3.99
pbr pbr
webtest webtest
basedeps = basedeps =
transaction transaction
pecan pecan
cloud_sptheme cloud_sptheme
Sphinx Sphinx
Flask Flask
@ -24,7 +24,7 @@ deps =
pbr pbr
nose nose
webtest < 1.4.99 webtest < 1.4.99
coverage coverage < 3.99
simplejson simplejson
suds suds
lxml lxml
@ -39,7 +39,7 @@ deps =
pbr pbr
nose nose
webtest < 1.4.99 webtest < 1.4.99
coverage coverage < 3.99
simplejson simplejson
suds suds
lxml lxml
@ -53,7 +53,7 @@ basepython = python2.6
deps = deps =
pbr pbr
nose nose
coverage coverage < 3.99
simplejson simplejson
commands = commands =
{envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest {envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
@ -68,7 +68,7 @@ deps =
pbr pbr
nose nose
webtest webtest
coverage coverage < 3.99
cornice cornice
commands = commands =
{envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs} {envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs}
@ -109,7 +109,7 @@ commands =
[testenv:coverage] [testenv:coverage]
basepython = python basepython = python
deps = deps =
coverage coverage < 3.99
setenv = setenv =
COVERAGE_FILE=.coverage COVERAGE_FILE=.coverage
commands = commands =
@ -733,7 +733,7 @@ basepython = python2.7
[testenv:py32-sa6-lxml-json] [testenv:py32-sa6-lxml-json]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -746,7 +746,7 @@ basepython = python3.2
[testenv:py32-sa6] [testenv:py32-sa6]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -759,7 +759,7 @@ basepython = python3.2
[testenv:py32-sa6-nolxml-json] [testenv:py32-sa6-nolxml-json]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -771,7 +771,7 @@ basepython = python3.2
[testenv:py32-sa6-nolxml] [testenv:py32-sa6-nolxml]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -783,7 +783,7 @@ basepython = python3.2
[testenv:py32-sa7-lxml-json] [testenv:py32-sa7-lxml-json]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -796,7 +796,7 @@ basepython = python3.2
[testenv:py32] [testenv:py32]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -809,7 +809,7 @@ basepython = python3.2
[testenv:py32-sa7-nolxml-json] [testenv:py32-sa7-nolxml-json]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =
@ -821,7 +821,7 @@ basepython = python3.2
[testenv:py32-nolxml] [testenv:py32-nolxml]
commands = commands =
{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs} {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
deps = deps =