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 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