8000 cleanup tox config: · pythonthings/github3.py@42db267 · GitHub
[go: up one dir, main page]

Skip to content

Commit 42db267

Browse files
committed
cleanup tox config:
* require tox>=2.5.0 * remove 2.6 leftovers * add 3.5 * remove shadowed basepython defaults. * trivial refactoring
1 parent 7e752ac commit 42db267

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ pytest>=2.3.5
55
wheel==0.21.0
66
betamax>=0.5.0
77
betamax_matchers>=0.2.0
8-
tox>=2.2.0
8+
tox>=2.5.0

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[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
34

45
[testenv]
56
pip_pre = False
@@ -9,17 +10,15 @@ deps =
910
pytest>=2.3.5
1011
betamax>=0.5.1
1112
betamax_matchers>=0.3.0
12-
pypy,py26,py27: unittest2
13+
pypy,py27: unittest2
1314
commands = py.test {posargs}
1415

1516
[testenv:py27-flake8]
16-
basepython = python2.7
1717
deps =
1818
flake8
1919
commands = flake8 {posargs} github3/ tests/unit/ tests/integration/
2020

2121
[testenv:py34-flake8]
22-
basepython = python3.4
2322
deps =
2423
{[testenv:py27-flake8]deps}
2524
commands = flake8 {posargs} github3/ tests/unit/ tests/integration/

0 commit comments

Comments
 (0)
0