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 From 0b09a81bf50029c3b1a4cc61f6fd88ba65b9afc6 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 19 Apr 2016 22:01:16 -0500 Subject: drop unsupported test endpoints --- tox.ini | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d29f41662..258b2892c 100644 --- a/tox.ini +++ b/tox.ini @@ -27,14 +27,8 @@ 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 +basepython = python3.3 commands = python pyramid/scaffolds/tests.py deps = virtualenv @@ -51,12 +45,6 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv -[testenv:pypy3-scaffolds] -basepython = pypy3 -commands = - python pyramid/scaffolds/tests.py -deps = virtualenv - [testenv:pep8] basepython = python3.5 commands = -- cgit v1.2.3 From e600d60408526fe510ace0f2c625793fea8e94b8 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 24 Apr 2016 20:54:16 -0700 Subject: add doctest to tox.ini [docs] environment --- tox.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 258b2892c..3c0d25493 100644 --- a/tox.ini +++ b/tox.ini @@ -58,6 +58,7 @@ whitelist_externals = make commands = pip install pyramid[docs] make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" + sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest # 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 -- cgit v1.2.3 From 0fec6d3d000425314f5a50f98d6409277b89512c Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 25 Apr 2016 00:19:35 -0700 Subject: put doctest into make command --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 3c0d25493..fc47faf17 100644 --- a/tox.ini +++ b/tox.ini @@ -57,8 +57,7 @@ basepython = python3.5 whitelist_externals = make commands = pip install pyramid[docs] - make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" - sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest + make -C docs doctest 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 -- cgit v1.2.3 From aa52c5f60dd329216b1ef459d53c2710bbaf5b50 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 10 May 2016 00:34:08 -0500 Subject: execute scaffolds using pip and py.test --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index fc47faf17..441b62223 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,12 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv +[testenv:py35-scaffolds] +basepython = python3.5 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + [testenv:pypy-scaffolds] basepython = pypy commands = -- cgit v1.2.3 From 66af391cb319c16a34acd0b1b087339e4a40271d Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 10 May 2016 00:44:47 -0500 Subject: drop pypy3 entirely until it supports py33+ --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 441b62223..55c723716 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27,py33,py34,py35,pypy,pypy3, + py27,py33,py34,py35,pypy, docs,pep8, {py2,py3}-cover,coverage, @@ -13,7 +13,6 @@ basepython = py34: python3.4 py35: python3.5 pypy: pypy - pypy3: pypy3 py2: python2.7 py3: python3.5 -- cgit v1.2.3 From 9cd1d152c450592f29264dfdc137c8015437e1aa Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 23 May 2016 12:28:29 -0700 Subject: add optional latexpdf build for PDF to tox - Closes #2575 --- tox.ini | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 55c723716..0156d9e51 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,13 @@ commands = pip install pyramid[docs] make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" +[testenv:pdf] +basepython = python3.5 +whitelist_externals = make +commands = + pip install pyramid[docs] + make -C docs latexpdf 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. -- cgit v1.2.3