Skip to content

Commit

Permalink
Merge py35-tox-8106: Add Python 3.5 to the Tox matrix
Browse files Browse the repository at this point in the history
Author: hawkowl
Reviewer: adiroiban
Fixes: twisted#8106

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@46242 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
hawkowl committed Nov 18, 2015
1 parent 16d6190 commit 90c1ce1
Showing 3 changed files with 12 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
[run]
include =
twisted/*
bin/*
admin/*
source = twisted
branch = True

[report]
18 changes: 11 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
; tox configuration file for running tests similar to buildbot builders.

[tox]
skip_missing_interpreters=True
toxworkdir=build/
envlist=
{py27,py33,py34}-{tests,nomodules}
{py27,py33,py34}-coverage
{py27,py33,py34,py35}-{tests,nomodules,coverage}
pyflakes,twistedchecker,apidocs,narrativedocs
skipsdist=True

@@ -34,20 +34,24 @@ deps =

commands =
py27-{tests,nomodules}: python {toxinidir}/bin/trial {posargs:twisted}
{py33,py34}-{tests,nomodules}: python {toxinidir}/admin/run-python3-tests {posargs:}
{py33,py34,py35}-{tests,nomodules}: python {toxinidir}/admin/run-python3-tests {posargs:}

twistedchecker: twistedchecker {posargs:twisted}
pyflakes: pyflakes {posargs:twisted}

apidocs: {toxinidir}/bin/admin/build-apidocs {toxinidir} apidocs
narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build docs {toxinidir}/docs/_build/
narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/

coverage: coverage erase
py27-coverage: coverage run {toxinidir}/bin/trial --reporter=bwverbose {posargs:twisted}
{py33,py34}-coverage: coverage run {toxinidir}/admin/run-python3-tests --reporter=bwverbose {posargs:}
coverage: coverage report
py27-coverage: coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/bin/trial --reporter=bwverbose {posargs:twisted}
{py33,py34,py35}-coverage: coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/admin/run-python3-tests --reporter=bwverbose {posargs:}
coverage: coverage report --rcfile={toxinidir}/.coveragerc

[testenv:twistedchecker]
basepython=python2.7
changedir={toxinidir}
[testenv:pyflakes]
basepython=python2.7
changedir={toxinidir}
[testenv:apidocs]
basepython=python2.7
Empty file added twisted/topfiles/8106.misc
Empty file.

0 comments on commit 90c1ce1

Please sign in to comment.