Skip to content

Commit bf77daa

Browse files
Merge pull request #2785 from nicoddemus/py36
Change to py36 as main environment for Python 3 environments in tox
2 parents ac5c5cc + 9933635 commit bf77daa

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

tox.ini

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ envlist =
1212
py36
1313
py37
1414
pypy
15-
{py27,py35}-{pexpect,xdist,trial,numpy}
15+
{py27,py36}-{pexpect,xdist,trial,numpy}
1616
py27-nobyte
1717
doctesting
1818
py35-freeze
@@ -37,7 +37,6 @@ deps =
3737

3838
[testenv:py27-subprocess]
3939
changedir = .
40-
basepython = python2.7
4140
deps =
4241
pytest-xdist>=1.13
4342
mock
@@ -68,7 +67,7 @@ deps =
6867
commands =
6968
pytest -n1 -rfsxX {posargs:testing}
7069

71-
[testenv:py35-xdist]
70+
[testenv:py36-xdist]
7271
deps = {[testenv:py27-xdist]deps}
7372
commands =
7473
pytest -n3 -rfsxX {posargs:testing}
@@ -80,7 +79,7 @@ deps = pexpect
8079
commands =
8180
pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py
8281

83-
[testenv:py35-pexpect]
82+
[testenv:py36-pexpect]
8483
changedir = testing
8584
platform = linux|darwin
8685
deps = {[testenv:py27-pexpect]deps}
@@ -102,7 +101,7 @@ deps = twisted
102101
commands =
103102
pytest -ra {posargs:testing/test_unittest.py}
104103

105-
[testenv:py35-trial]
104+
[testenv:py36-trial]
106105
deps = {[testenv:py27-trial]deps}
107106
commands =
108107
pytest -ra {posargs:testing/test_unittest.py}
@@ -112,7 +111,7 @@ deps=numpy
112111
commands=
113112
pytest -rfsxX {posargs:testing/python/approx.py}
114113

115-
[testenv:py35-numpy]
114+
[testenv:py36-numpy]
116115
deps=numpy
117116
commands=
118117
pytest -rfsxX {posargs:testing/python/approx.py}
@@ -180,7 +179,6 @@ commands =
180179
[testenv:coveralls]
181180
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN
182181
usedevelop = True
183-
basepython = python3.5
184182
changedir = .
185183
deps =
186184
{[testenv]deps}

0 commit comments

Comments
 (0)