From b47e90807ec9fcff7ab19faf0a17f68b2db07f21 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 20 Apr 2015 00:33:52 -0500 Subject: rearrange tox.ini --- tox.ini | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 32fcb45fd..f3b21561f 100644 --- a/tox.ini +++ b/tox.ini @@ -22,13 +22,6 @@ commands = pip install pyramid[testing] nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} -[testenv:pep8] -basepython = python3.4 -commands = - flake8 pyramid/ -deps = - flake8 - # we separate coverage into its own testenv because a) "last run wins" wrt # cobertura jenkins reporting and b) pypy and jython can't handle any # combination of versions of coverage and nosexcover that i can find. @@ -48,18 +41,6 @@ commands = setenv = COVERAGE_FILE=.coverage.py3 -[testenv:py2-docs] -whitelist_externals = make -commands = - pip install pyramid[docs] - make -C docs html epub BUILDDIR={envdir} - -[testenv:py3-docs] -whitelist_externals = make -commands = - pip install pyramid[docs] - make -C docs html epub BUILDDIR={envdir} - [testenv:coverage] basepython = python3.4 commands = @@ -72,6 +53,18 @@ deps = setenv = COVERAGE_FILE=.coverage +[testenv:py2-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html epub BUILDDIR={envdir} + +[testenv:py3-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html epub BUILDDIR={envdir} + [testenv:py26-scaffolds] basepython = python2.6 commands = @@ -113,3 +106,10 @@ basepython = pypy3 commands = python pyramid/scaffolds/tests.py deps = virtualenv + +[testenv:pep8] +basepython = python3.4 +commands = + flake8 pyramid/ +deps = + flake8 -- cgit v1.2.3 From 6aa76071204f4ba6b4f65916032fff059e6838ed Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 31 May 2015 11:14:38 -0700 Subject: move -E from Makefile to tox.ini so that we don't punish manual doc builds --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index f3b21561f..d3e494de9 100644 --- a/tox.ini +++ b/tox.ini @@ -57,13 +57,13 @@ setenv = whitelist_externals = make commands = pip install pyramid[docs] - make -C docs html epub BUILDDIR={envdir} + make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" [testenv:py3-docs] whitelist_externals = make commands = pip install pyramid[docs] - make -C docs html epub BUILDDIR={envdir} + make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" [testenv:py26-scaffolds] basepython = python2.6 -- cgit v1.2.3 From cc9126ed2b215fe6c59ca9eb74e6e0a55b9fc76e Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sun, 11 Oct 2015 22:45:07 -0600 Subject: Make sure we test on Python 3.5 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d3e494de9..ae93c3785 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3,pep8, + py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8, {py2,py3}-docs, {py2,py3}-cover,coverage, @@ -13,6 +13,7 @@ basepython = py32: python3.2 py33: python3.3 py34: python3.4 + py35: python3.5 pypy: pypy pypy3: pypy3 py2: python2.7 -- cgit v1.2.3 From 6013930f5e119e3383588aeb2802811111caac40 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sun, 11 Oct 2015 23:55:14 -0600 Subject: No cover a branch --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index ae93c3785..20a9ee5b1 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ basepython = pypy: pypy pypy3: pypy3 py2: python2.7 - py3: python3.4 + py3: python3.5 commands = pip install pyramid[testing] -- cgit v1.2.3