Merge remote-tracking branch 'upstream/master' into merge-master-into-features

1 files changed, 10 insertions, 10 deletions

diff --git a/tox.ini b/tox.ini
index 6088aa6e6..8fe0124f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,10 +10,10 @@ envlist =
     py36
     py37
     pypy
-    {py27,py36}-{pexpect,xdist,trial,numpy,pluggymaster}
+    {py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster}
     py27-nobyte
     doctesting
-    py36-freeze
+    py37-freeze
     docs
 
 [testenv]
@@ -23,7 +23,7 @@ commands =
     coverage: coverage report
 passenv = USER USERNAME COVERAGE_* TRAVIS
 setenv =
-    # configuration if a user runs tox with a "coverage" factor, for example "tox -e py36-coverage"
+    # configuration if a user runs tox with a "coverage" factor, for example "tox -e py37-coverage"
     coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
     coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
     coverage: COVERAGE_FILE={toxinidir}/.coverage
@@ -46,7 +46,7 @@ commands =
 
 [testenv:linting]
 skip_install = True
-basepython = python3.6
+basepython = python3
 deps = pre-commit>=1.11.0
 commands = pre-commit run --all-files --show-diff-on-failure
 
@@ -60,7 +60,7 @@ deps =
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs}
 
-[testenv:py36-xdist]
+[testenv:py37-xdist]
 # NOTE: copied from above due to https://github.com/tox-dev/tox/issues/706.
 deps =
     pytest-xdist>=1.13
@@ -78,7 +78,7 @@ deps =
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py {posargs}
 
-[testenv:py36-pexpect]
+[testenv:py37-pexpect]
 platform = {[testenv:py27-pexpect]platform}
 deps = {[testenv:py27-pexpect]deps}
 commands = {[testenv:py27-pexpect]commands}
@@ -103,7 +103,7 @@ deps =
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
 
-[testenv:py36-trial]
+[testenv:py37-trial]
 deps = {[testenv:py27-trial]deps}
 commands = {[testenv:py27-trial]commands}
 
@@ -114,7 +114,7 @@ deps =
 commands=
   {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py}
 
-[testenv:py36-numpy]
+[testenv:py37-numpy]
 deps = {[testenv:py27-numpy]deps}
 commands = {[testenv:py27-numpy]commands}
 
@@ -125,7 +125,7 @@ setenv=
     # NOTE: using env instead of "{[testenv]deps}", because of https://github.com/tox-dev/tox/issues/706.
     _PYTEST_TOX_EXTRA_DEP=git+https://github.com/pytest-dev/pluggy.git@master
 
-[testenv:py36-pluggymaster]
+[testenv:py37-pluggymaster]
 setenv = {[testenv:py27-pluggymaster]setenv}
 
 [testenv:docs]
@@ -170,7 +170,7 @@ changedir = testing
 commands =
     {envpython} {envbindir}/py.test-jython {posargs}
 
-[testenv:py36-freeze]
+[testenv:py37-freeze]
 changedir = testing/freeze
 deps =
     pyinstaller