Commit42db267

committed

cleanup tox config:

* require tox>=2.5.0* remove 2.6 leftovers* add 3.5* remove shadowed basepython defaults.* trivial refactoring

1 parent7e752ac commit42db267Copy full SHA for 42db267

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`[tox]`
`2`		`-envlist = py27,py33,py34,pypy,{py27,py34}-flake8,docstrings`
	`2`	`+envlist = py{27,33,34,35,py},py{27,34}-flake8,docstrings`
	`3`	`+minversion = 2.5.0`
`3`	`4`
`4`	`5`	`[testenv]`
`5`	`6`	`pip_pre = False`
`@@ -9,17 +10,15 @@ deps =`
`9`	`10`	`pytest>=2.3.5`
`10`	`11`	`betamax>=0.5.1`
`11`	`12`	`betamax_matchers>=0.3.0`
`12`		`- pypy,py26,py27: unittest2`
	`13`	`+ pypy,py27: unittest2`
`13`	`14`	`commands = py.test {posargs}`
`14`	`15`
`15`	`16`	`[testenv:py27-flake8]`
`16`		`-basepython = python2.7`
`17`	`17`	`deps =`
`18`	`18`	`flake8`
`19`	`19`	`commands = flake8 {posargs} github3/ tests/unit/ tests/integration/`
`20`	`20`
`21`	`21`	`[testenv:py34-flake8]`
`22`		`-basepython = python3.4`
`23`	`22`	`deps =`
`24`	`23`	`{[testenv:py27-flake8]deps}`
`25`	`24`	`commands = flake8 {posargs} github3/ tests/unit/ tests/integration/`

Comments

(0)