p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2785 from nicoddemus/py36 

Change to py36 as main environment for Python 3 environments in tox
This commit is contained in:
Ronny Pfannschmidt 2017-09-17 09:19:06 +02:00 committed by GitHub
parent ac5c5cc1ef 9933635cf7
commit bf77daa2ee
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tox.ini
View File

@ -12,7 +12,7 @@ envlist =
py36 py36
py37 py37
pypy pypy
{py27,py35}-{pexpect,xdist,trial,numpy} {py27,py36}-{pexpect,xdist,trial,numpy}
py27-nobyte py27-nobyte
doctesting doctesting
py35-freeze py35-freeze
@ -37,7 +37,6 @@ deps =
[testenv:py27-subprocess] [testenv:py27-subprocess]
changedir = . changedir = .
basepython = python2.7
deps = deps =
pytest-xdist>=1.13 pytest-xdist>=1.13
mock mock
@ -68,7 +67,7 @@ deps =
commands = commands =
pytest -n1 -rfsxX {posargs:testing} pytest -n1 -rfsxX {posargs:testing}
[testenv:py35-xdist] [testenv:py36-xdist]
deps = {[testenv:py27-xdist]deps} deps = {[testenv:py27-xdist]deps}
commands = commands =
pytest -n3 -rfsxX {posargs:testing} pytest -n3 -rfsxX {posargs:testing}
@ -80,7 +79,7 @@ deps = pexpect
commands = commands =
pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py
[testenv:py35-pexpect] [testenv:py36-pexpect]
changedir = testing changedir = testing
platform = linux|darwin platform = linux|darwin
deps = {[testenv:py27-pexpect]deps} deps = {[testenv:py27-pexpect]deps}
@ -102,7 +101,7 @@ deps = twisted
commands = commands =
pytest -ra {posargs:testing/test_unittest.py} pytest -ra {posargs:testing/test_unittest.py}
[testenv:py35-trial] [testenv:py36-trial]
deps = {[testenv:py27-trial]deps} deps = {[testenv:py27-trial]deps}
commands = commands =
pytest -ra {posargs:testing/test_unittest.py} pytest -ra {posargs:testing/test_unittest.py}
@ -112,7 +111,7 @@ deps=numpy
commands= commands=
pytest -rfsxX {posargs:testing/python/approx.py} pytest -rfsxX {posargs:testing/python/approx.py}
[testenv:py35-numpy] [testenv:py36-numpy]
deps=numpy deps=numpy
commands= commands=
pytest -rfsxX {posargs:testing/python/approx.py} pytest -rfsxX {posargs:testing/python/approx.py}
@ -180,7 +179,6 @@ commands =
[testenv:coveralls] [testenv:coveralls]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN
usedevelop = True usedevelop = True
basepython = python3.5
changedir = . changedir = .
deps = deps =
{[testenv]deps} {[testenv]deps}