From 5484e3e9be61b82b55e6e1e94365cfb3cd4d3a94 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 14 Jun 2011 06:17:39 -0400 Subject: we no longer support 2.4 --- tox.ini | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 73a487ac8..e404b29f4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py24,py25,py26,py27,jython,pypy,cover + py25,py26,py27,jython,pypy,cover [testenv] commands = @@ -11,17 +11,6 @@ deps = repoze.sphinx.autointerface virtualenv -[testenv:py24] -# Chameleon 2 doesnt work under py2.4 -commands = - python setup.py test -q -deps = - Sphinx - WebTest - repoze.sphinx.autointerface - virtualenv - Chameleon<=1.999 - [testenv:jython] commands = jython setup.py test -q -- cgit v1.2.3 From 2d751a2b0bf06d303a4313fd922a93451d380d38 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 20 Jul 2011 12:34:56 -0400 Subject: pin coverage for nosexcover+tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e404b29f4..40711a5f2 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ deps = repoze.sphinx.autointerface virtualenv nose - coverage + coverage==3.4 nosexcover # we separate coverage into its own testenv because a) "last run wins" wrt -- cgit v1.2.3 From 10b4f1c76c13df070224fa6b298b013d03ccddbc Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 22 Sep 2011 23:05:41 -0500 Subject: Removed py25 from tox.ini. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 40711a5f2..58980e805 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py25,py26,py27,jython,pypy,cover + py26,py27,jython,pypy,cover [testenv] commands = -- cgit v1.2.3 From 795253eefe30d8799a55d31e9905c6af21a32ffb Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 24 Sep 2011 18:57:20 -0400 Subject: fix setup.py and tox.ini for dev/testing purposes --- tox.ini | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 58980e805..a422b2eb6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,25 @@ [tox] envlist = - py26,py27,jython,pypy,cover + py26,py27,py32,pypy,cover [testenv] commands = python setup.py test -q deps = + https://github.com/Pylons/webob/zipball/master + zope.component Sphinx - WebTest repoze.sphinx.autointerface + WebTest virtualenv -[testenv:jython] +[testenv:py32] commands = - jython setup.py test -q + python setup.py test -q +deps = + https://github.com/Pylons/webob/zipball/master + WebTest + virtualenv [testenv:cover] basepython = @@ -21,6 +27,8 @@ basepython = commands = python setup.py nosetests --with-xunit --with-xcoverage deps = + https://github.com/Pylons/webob/zipball/master + zope.component Sphinx WebTest repoze.sphinx.autointerface -- cgit v1.2.3 From 9713a66fe175d5045340557f1a720e87419cad2e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 14 Oct 2011 18:27:37 -0400 Subject: webob 1.2b1 is up on pypi now --- tox.ini | 3 --- 1 file changed, 3 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a422b2eb6..79728bc18 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,6 @@ envlist = commands = python setup.py test -q deps = - https://github.com/Pylons/webob/zipball/master zope.component Sphinx repoze.sphinx.autointerface @@ -17,7 +16,6 @@ deps = commands = python setup.py test -q deps = - https://github.com/Pylons/webob/zipball/master WebTest virtualenv @@ -27,7 +25,6 @@ basepython = commands = python setup.py nosetests --with-xunit --with-xcoverage deps = - https://github.com/Pylons/webob/zipball/master zope.component Sphinx WebTest -- cgit v1.2.3 From e4b8fa632c5d2b020e168f4efe3d7c00049a279f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 9 Feb 2012 00:12:26 -0500 Subject: Features -------- - The ``scan`` method of a ``Configurator`` can be passed an ``ignore`` argument, which can be a string, a callable, or a list consisting of strings and/or callables. This feature allows submodules, subpackages, and global objects from being scanned. See http://readthedocs.org/docs/venusian/en/latest/#ignore-scan-argument for more information about how to use the ``ignore`` argument to ``scan``. Dependencies ------------ - Depend on ``venusian`` >= 1.0a3 to provide scan ``ignore`` support. --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 79728bc18..1e7223886 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,7 @@ deps = repoze.sphinx.autointerface WebTest virtualenv + venusian>=1.0a3 [testenv:py32] commands = @@ -18,6 +19,7 @@ commands = deps = WebTest virtualenv + venusian>=1.0a3 [testenv:cover] basepython = @@ -30,6 +32,7 @@ deps = WebTest repoze.sphinx.autointerface virtualenv + venusian>=1.0a3 nose coverage==3.4 nosexcover -- cgit v1.2.3 From 89f1581b816a03a282e7fd487a6f5e6058dbff04 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 01:03:57 -0400 Subject: also install nose and coverage --- tox.ini | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 1e7223886..4e732a178 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,9 @@ deps = repoze.sphinx.autointerface WebTest virtualenv - venusian>=1.0a3 + venusian + nose + coverage [testenv:py32] commands = @@ -19,7 +21,9 @@ commands = deps = WebTest virtualenv - venusian>=1.0a3 + venusian + nose + coverage [testenv:cover] basepython = @@ -32,9 +36,9 @@ deps = WebTest repoze.sphinx.autointerface virtualenv - venusian>=1.0a3 + venusian nose - coverage==3.4 + coverage nosexcover # we separate coverage into its own testenv because a) "last run wins" wrt -- cgit v1.2.3 From c75e507c7eab84e317588823b6a0e332561212ef Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 17 Mar 2012 16:32:00 -0400 Subject: dont depend on nose or coverage except for in extras --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 4e732a178..97aa6c4d0 100644 --- a/tox.ini +++ b/tox.ini @@ -12,8 +12,6 @@ deps = WebTest virtualenv venusian - nose - coverage [testenv:py32] commands = @@ -22,8 +20,6 @@ deps = WebTest virtualenv venusian - nose - coverage [testenv:cover] basepython = -- cgit v1.2.3 From b555e98c477056a7b32a46294c42c11a3b96b432 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Fri, 1 Jun 2012 07:56:13 -0700 Subject: Add "py33" to tox.ini --- tox.ini | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 97aa6c4d0..85bd41bda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,pypy,cover + py26,py27,py32,py33,pypy,cover [testenv] commands = @@ -21,6 +21,14 @@ deps = virtualenv venusian +[testenv:py33] +commands = + python setup.py test -q +deps = + WebTest + virtualenv + venusian + [testenv:cover] basepython = python2.6 -- cgit v1.2.3 From 797f689bc3963b653ab047881b740b94d8f4015f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 8 Sep 2012 18:30:21 -0400 Subject: simplify tox.ini --- tox.ini | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 85bd41bda..b50e56544 100644 --- a/tox.ini +++ b/tox.ini @@ -4,45 +4,16 @@ envlist = [testenv] commands = + python setup.py dev python setup.py test -q -deps = - zope.component - Sphinx - repoze.sphinx.autointerface - WebTest - virtualenv - venusian - -[testenv:py32] -commands = - python setup.py test -q -deps = - WebTest - virtualenv - venusian - -[testenv:py33] -commands = - python setup.py test -q -deps = - WebTest - virtualenv - venusian [testenv:cover] basepython = python2.6 commands = + python setup.py dev python setup.py nosetests --with-xunit --with-xcoverage deps = - zope.component - Sphinx - WebTest - repoze.sphinx.autointerface - virtualenv - venusian - nose - coverage nosexcover # we separate coverage into its own testenv because a) "last run wins" wrt -- cgit v1.2.3 From 0a2ea908f35f245b1c4750d8d97ffe645ce29a57 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 13 Nov 2013 17:36:35 -0800 Subject: tox.ini: Add py34 Useful for testing with the new Python 3.4 alpha versions. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index b50e56544..2bf213ca4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,pypy,cover + py26,py27,py32,py33,py34,pypy,cover [testenv] commands = -- cgit v1.2.3 From e0c09c151ffb9bce0fdc71fb351745e3c282bb18 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sun, 16 Nov 2014 22:15:15 -0800 Subject: Make sure tox fails the cover build if it isn't at 100% --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 2bf213ca4..9a9c5a983 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ basepython = python2.6 commands = python setup.py dev - python setup.py nosetests --with-xunit --with-xcoverage + python setup.py nosetests --with-xunit --with-xcoverage --cover-min-percentage=100 deps = nosexcover -- cgit v1.2.3 From bc8e4d2acf583b9c581202c0f0efee3ee1da710a Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 21 Nov 2014 14:26:10 -0500 Subject: Add support for testing 'pypy3' under Tox / Travis. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 9a9c5a983..3f32dbc3f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,cover + py26,py27,py32,py33,py34,pypy,pypy3,cover [testenv] commands = -- cgit v1.2.3 From cf4ad5eaea4af3da3bbac4c421fe5f959ed1d256 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 21 Nov 2014 18:54:20 -0600 Subject: update tox/travis to check code coverage on py3 coverage is combined between py2 and py3 for an aggregate coverage metric. This means we can stop putting "no cover" gates around py3 code and ignoring whether it's ever tested. --- tox.ini | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3f32dbc3f..ba0007d7a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,17 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3,cover + clean,py26,py27,py32,py33,py34,pypy,pypy3,report + +[testenv:clean] +commands = coverage erase +deps = coverage [testenv] commands = python setup.py dev - python setup.py test -q + python setup.py nosetests --with-coverage -[testenv:cover] -basepython = - python2.6 +[testenv:report] commands = python setup.py dev python setup.py nosetests --with-xunit --with-xcoverage --cover-min-percentage=100 -- cgit v1.2.3 From cc15bbf7de74f4cdfc676e34fa429d2658d1ddf6 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 9 Dec 2014 11:00:41 -0500 Subject: Move coverage floor pct into 'setup.cfg'. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3f32dbc3f..714c5b6d3 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ basepython = python2.6 commands = python setup.py dev - python setup.py nosetests --with-xunit --with-xcoverage --cover-min-percentage=100 + python setup.py nosetests --with-xunit --with-xcoverage deps = nosexcover -- cgit v1.2.3 From 7c8c852b3de053e4e8e459f3fc74e4b7d05aab93 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 30 Jan 2015 11:42:01 -0500 Subject: Suppress setuptools chatter when testing under tox. --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 714c5b6d3..29bd48639 100644 --- a/tox.ini +++ b/tox.ini @@ -4,15 +4,15 @@ envlist = [testenv] commands = - python setup.py dev - python setup.py test -q + python setup.py -q dev + python setup.py -q test -q [testenv:cover] basepython = python2.6 commands = - python setup.py dev - python setup.py nosetests --with-xunit --with-xcoverage + python setup.py -q dev + nosetests --with-xunit --with-xcoverage deps = nosexcover -- cgit v1.2.3 From 25c64c68d45d11f63684ac6d7ac7fb7e86f6acd3 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sat, 7 Feb 2015 21:06:23 -0800 Subject: Add initial pep8 support. This ignores plenty of warnings and errors in pep8 and only focuses on a small subset that can easily be achieved. Ignores applying pep8 to tests for now and only enforces on the pyramid core code. --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 29bd48639..756988c91 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,12 @@ commands = deps = nosexcover +[testenv:pep8] +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. -- cgit v1.2.3 From 14126cae5cf308ed466ed3eea576094e9c2193b4 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Feb 2015 12:25:02 -0600 Subject: fix up tests to generate coverage reports always and combine at the end --- tox.ini | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index ba0007d7a..dae31ddd6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,24 +1,27 @@ [tox] +skipsdist = True envlist = - clean,py26,py27,py32,py33,py34,pypy,pypy3,report - -[testenv:clean] -commands = coverage erase -deps = coverage + py26,py27,py32,py33,py34,pypy,pypy3,cover [testenv] commands = - python setup.py dev - python setup.py nosetests --with-coverage + {envbindir}/python setup.py dev + {envbindir}/coverage run --source={toxinidir}/pyramid {envbindir}/nosetests --xunit-file=nosetests-{envname}.xml + {envbindir}/coverage xml -o coverage-{envname}.xml +setenv = + COVERAGE_FILE=.coverage.{envname} -[testenv:report] +[testenv:cover] commands = - python setup.py dev - python setup.py nosetests --with-xunit --with-xcoverage --cover-min-percentage=100 + {envbindir}/coverage erase + {envbindir}/coverage combine + {envbindir}/coverage xml + {envbindir}/coverage report --show-missing --fail-under=100 deps = - nosexcover + coverage +setenv = + COVERAGE_FILE=.coverage # 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. - -- cgit v1.2.3 From a9282da880bfc1da654fc1c547a20fdfb3539fd1 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 20 Feb 2015 17:52:41 -0600 Subject: split out targets for py2-cover and py3-cover and add docs building --- tox.ini | 70 +++++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 17 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index dae31ddd6..22f21a6a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,27 +1,63 @@ [tox] -skipsdist = True -envlist = - py26,py27,py32,py33,py34,pypy,pypy3,cover +envlist = + py26,py27,py32,py33,py34,pypy,pypy3, + {py2,py3}-docs + {py2,py3}-cover,coverage [testenv] -commands = - {envbindir}/python setup.py dev - {envbindir}/coverage run --source={toxinidir}/pyramid {envbindir}/nosetests --xunit-file=nosetests-{envname}.xml - {envbindir}/coverage xml -o coverage-{envname}.xml +# Most of these are defaults but if you specify any you can't fall back +# to defaults for others. +basepython = + py26: python2.6 + py27: python2.7 + py32: python3.2 + py33: python3.3 + py34: python3.4 + pypy: pypy + pypy3: pypy3 + py2: python2.7 + py3: python3.4 + +commands = + pip install pyramid[testing] + nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} + +[testenv:py2-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests --with-xunit --xunit-file=nosetests-py2.xml {posargs:} + coverage xml -o coverage-py2.xml +setenv = + COVERAGE_FILE=.coverage.py2 + +[testenv:py3-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests --with-xunit --xunit-file=nosetests-py3.xml {posargs:} + coverage xml -o coverage-py3.xml setenv = - COVERAGE_FILE=.coverage.{envname} + COVERAGE_FILE=.coverage.py3 + +[testenv:py2-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html -[testenv:cover] +[testenv:py3-docs] +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html + +[testenv:coverage] +basepython = python3.4 commands = - {envbindir}/coverage erase - {envbindir}/coverage combine - {envbindir}/coverage xml - {envbindir}/coverage report --show-missing --fail-under=100 + coverage erase + coverage combine + coverage xml + coverage report --show-missing --fail-under=100 deps = coverage setenv = COVERAGE_FILE=.coverage - -# 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. -- cgit v1.2.3 From d476e6932f67adee5116620b546590ba0c2083de Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 20 Feb 2015 17:57:25 -0600 Subject: dump xunit for py2/py3 targets --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 22f21a6a3..e0f99e7f6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py26,py27,py32,py33,py34,pypy,pypy3, - {py2,py3}-docs + {py2,py3}-docs, {py2,py3}-cover,coverage [testenv] @@ -25,7 +25,7 @@ commands = [testenv:py2-cover] commands = pip install pyramid[testing] - coverage run --source=pyramid {envbindir}/nosetests --with-xunit --xunit-file=nosetests-py2.xml {posargs:} + coverage run --source=pyramid {envbindir}/nosetests coverage xml -o coverage-py2.xml setenv = COVERAGE_FILE=.coverage.py2 @@ -33,7 +33,7 @@ setenv = [testenv:py3-cover] commands = pip install pyramid[testing] - coverage run --source=pyramid {envbindir}/nosetests --with-xunit --xunit-file=nosetests-py3.xml {posargs:} + coverage run --source=pyramid {envbindir}/nosetests coverage xml -o coverage-py3.xml setenv = COVERAGE_FILE=.coverage.py3 -- cgit v1.2.3 From 109b2a0b29e0d63a521a91021c736851248ac7d3 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 13 Apr 2015 10:43:21 -0400 Subject: make it possible to run scaffold functests using tox --- tox.ini | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e0f99e7f6..e0ef2277b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,8 @@ envlist = py26,py27,py32,py33,py34,pypy,pypy3, {py2,py3}-docs, - {py2,py3}-cover,coverage + {py2,py3}-cover,coverage, + scaffolds [testenv] # Most of these are defaults but if you specify any you can't fall back @@ -61,3 +62,27 @@ deps = coverage setenv = COVERAGE_FILE=.coverage + +[testenv:py3-scaffolds] +basepython = python3.4 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:py2-scaffolds] +basepython = python2.7 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:pypy-scaffolds] +basepython = pypy +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:pypy3-scaffolds] +basepython = pypy3 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv -- cgit v1.2.3 From 46805450633291682f97e87055313fc3be477326 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 13 Apr 2015 10:59:18 -0400 Subject: unbreak tox --- tox.ini | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e0ef2277b..bfaf8c008 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ envlist = py26,py27,py32,py33,py34,pypy,pypy3, {py2,py3}-docs, {py2,py3}-cover,coverage, - scaffolds [testenv] # Most of these are defaults but if you specify any you can't fall back @@ -63,14 +62,14 @@ deps = setenv = COVERAGE_FILE=.coverage -[testenv:py3-scaffolds] -basepython = python3.4 +[testenv:py2-scaffolds] +basepython = python2.7 commands = python pyramid/scaffolds/tests.py deps = virtualenv -[testenv:py2-scaffolds] -basepython = python2.7 +[testenv:py3-scaffolds] +basepython = python3.4 commands = python pyramid/scaffolds/tests.py deps = virtualenv -- cgit v1.2.3 From aa1c9b70369b011856c3b84e288975c1d121d439 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 13 Apr 2015 11:46:50 -0400 Subject: change releasing and hacking docs to reflect new order of using tox to test docs and scaffolds --- tox.ini | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index bfaf8c008..2b974b07e 100644 --- a/tox.ini +++ b/tox.ini @@ -62,13 +62,31 @@ deps = setenv = COVERAGE_FILE=.coverage -[testenv:py2-scaffolds] -basepython = python2.7 +[testenv:py26-scaffolds] +basepython = python2.6 commands = python pyramid/scaffolds/tests.py deps = virtualenv -[testenv:py3-scaffolds] +[testenv:py27-scaffolds] +basepython = python2.6 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:py32-scaffolds] +basepython = python3.2 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:py33-scaffolds] +basepython = python3.4 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + +[testenv:py34-scaffolds] basepython = python3.4 commands = python pyramid/scaffolds/tests.py -- cgit v1.2.3 From 4d8580c92b1c4ed45e954f79fcbe1dc018ee700b Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 19 Apr 2015 16:14:17 -0500 Subject: add epub to docs and specify a env-specific build dir for docs --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 2b974b07e..7f3d0c906 100644 --- a/tox.ini +++ b/tox.ini @@ -42,13 +42,13 @@ setenv = whitelist_externals = make commands = pip install pyramid[docs] - make -C docs html + make -C docs html epub BUILDDIR={envdir} [testenv:py3-docs] whitelist_externals = make commands = pip install pyramid[docs] - make -C docs html + make -C docs html epub BUILDDIR={envdir} [testenv:coverage] basepython = python3.4 -- cgit v1.2.3 From 2af5552a41c82e415092e19ffcc49b16965fb378 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 19 Apr 2015 16:26:05 -0500 Subject: touch up pr 1571 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e8d7a057b..8dc361d20 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = [testenv:pep8] basepython = python3.4 commands = - flake8 pyramid/ + flake8 pyramid/ deps = flake8 -- cgit v1.2.3 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 From a708d359ff123084ea64b2e53c3ad32a74711219 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 25 Nov 2015 18:52:54 -0600 Subject: remove py2-docs from tox.ini and reorder so coverage is last --- tox.ini | 87 +++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 46 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 20a9ee5b1..626931faf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8, - {py2,py3}-docs, + py26,py27,py32,py33,py34,py35,pypy,pypy3, + docs,pep8, {py2,py3}-cover,coverage, [testenv] @@ -23,49 +23,6 @@ commands = pip install pyramid[testing] nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} -# 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. -[testenv:py2-cover] -commands = - pip install pyramid[testing] - coverage run --source=pyramid {envbindir}/nosetests - coverage xml -o coverage-py2.xml -setenv = - COVERAGE_FILE=.coverage.py2 - -[testenv:py3-cover] -commands = - pip install pyramid[testing] - coverage run --source=pyramid {envbindir}/nosetests - coverage xml -o coverage-py3.xml -setenv = - COVERAGE_FILE=.coverage.py3 - -[testenv:coverage] -basepython = python3.4 -commands = - coverage erase - coverage combine - coverage xml - coverage report --show-missing --fail-under=100 -deps = - coverage -setenv = - COVERAGE_FILE=.coverage - -[testenv:py2-docs] -whitelist_externals = make -commands = - pip install pyramid[docs] - 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} "SPHINXOPTS=-W -E" - [testenv:py26-scaffolds] basepython = python2.6 commands = @@ -109,8 +66,46 @@ commands = deps = virtualenv [testenv:pep8] -basepython = python3.4 +basepython = python3.5 commands = flake8 pyramid/ deps = flake8 + +[testenv:docs] +basepython = python3.5 +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" + +# 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. +[testenv:py2-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests + coverage xml -o coverage-py2.xml +setenv = + COVERAGE_FILE=.coverage.py2 + +[testenv:py3-cover] +commands = + pip install pyramid[testing] + coverage run --source=pyramid {envbindir}/nosetests + coverage xml -o coverage-py3.xml +setenv = + COVERAGE_FILE=.coverage.py3 + +[testenv:coverage] +basepython = python3.5 +commands = + coverage erase + coverage combine + coverage xml + coverage report --show-missing --fail-under=100 +deps = + coverage +setenv = + COVERAGE_FILE=.coverage -- cgit v1.2.3 From b74126bcfd716dad9851c50464da6f01481df5e5 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Wed, 20 Jan 2016 00:17:01 -0700 Subject: Remove Python 3.2 from tox --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 626931faf..096600aec 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,py35,pypy,pypy3, + py26,py27,py33,py34,py35,pypy,pypy3, docs,pep8, {py2,py3}-cover,coverage, @@ -10,7 +10,6 @@ envlist = basepython = py26: python2.6 py27: python2.7 - py32: python3.2 py33: python3.3 py34: python3.4 py35: python3.5 -- cgit v1.2.3 From 4cd6cb4238f092baa19d477b1016c35af92b7b56 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sun, 10 Apr 2016 20:52:03 -0600 Subject: Remove Python 2.6 from all testing This removes it from tox/travis --- tox.ini | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 096600aec..d29f41662 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py33,py34,py35,pypy,pypy3, + py27,py33,py34,py35,pypy,pypy3, docs,pep8, {py2,py3}-cover,coverage, @@ -8,7 +8,6 @@ envlist = # Most of these are defaults but if you specify any you can't fall back # to defaults for others. basepython = - py26: python2.6 py27: python2.7 py33: python3.3 py34: python3.4 @@ -22,14 +21,8 @@ commands = pip install pyramid[testing] nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} -[testenv:py26-scaffolds] -basepython = python2.6 -commands = - python pyramid/scaffolds/tests.py -deps = virtualenv - [testenv:py27-scaffolds] -basepython = python2.6 +basepython = python2.7 commands = python pyramid/scaffolds/tests.py deps = virtualenv -- cgit v1.2.3