diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2017-09-17 09:19:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 09:19:06 +0200 |
| commit | bf77daa2ee42ada71bb4904fb657d9c860f4a684 (patch) | |
| tree | 3a0420374c0e335fd27841c3b5e9b7df58c8dee4 | |
| parent | ac5c5cc1efb6a0ae089f1b9f06b3782128534eac (diff) | |
| parent | 9933635cf7a2462bfb1d3d4deee3029eb8318b82 (diff) | |
| download | pytest-bf77daa2ee42ada71bb4904fb657d9c860f4a684.tar.gz | |
Merge pull request #2785 from nicoddemus/py36
Change to py36 as main environment for Python 3 environments in tox
| -rw-r--r-- | tox.ini | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -12,7 +12,7 @@ envlist = py36 py37 pypy - {py27,py35}-{pexpect,xdist,trial,numpy} + {py27,py36}-{pexpect,xdist,trial,numpy} py27-nobyte doctesting py35-freeze @@ -37,7 +37,6 @@ deps = [testenv:py27-subprocess] changedir = . -basepython = python2.7 deps = pytest-xdist>=1.13 mock @@ -68,7 +67,7 @@ deps = commands = pytest -n1 -rfsxX {posargs:testing} -[testenv:py35-xdist] +[testenv:py36-xdist] deps = {[testenv:py27-xdist]deps} commands = pytest -n3 -rfsxX {posargs:testing} @@ -80,7 +79,7 @@ deps = pexpect commands = pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py -[testenv:py35-pexpect] +[testenv:py36-pexpect] changedir = testing platform = linux|darwin deps = {[testenv:py27-pexpect]deps} @@ -102,7 +101,7 @@ deps = twisted commands = pytest -ra {posargs:testing/test_unittest.py} -[testenv:py35-trial] +[testenv:py36-trial] deps = {[testenv:py27-trial]deps} commands = pytest -ra {posargs:testing/test_unittest.py} @@ -112,7 +111,7 @@ deps=numpy commands= pytest -rfsxX {posargs:testing/python/approx.py} -[testenv:py35-numpy] +[testenv:py36-numpy] deps=numpy commands= pytest -rfsxX {posargs:testing/python/approx.py} @@ -180,7 +179,6 @@ commands = [testenv:coveralls] passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN usedevelop = True -basepython = python3.5 changedir = . deps = {[testenv]deps} |