Skip to content

Commit 935b106

Browse files
committed
CI: use py37 instead of py36 by default
Closes #4370.
1 parent 9af613b commit 935b106

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88
- name: deploy
99
if: repo = pytest-dev/pytest AND tag IS present
1010
python:
11-
- '3.6'
11+
- '3.7'
1212
install:
1313
- pip install --upgrade --pre tox
1414
env:
@@ -18,10 +18,11 @@ env:
1818
- TOXENV=py27-nobyte
1919
- TOXENV=py27-xdist
2020
- TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
21-
# Specialized factors for py36.
22-
- TOXENV=py36-pexpect,py36-trial,py36-numpy
23-
- TOXENV=py36-xdist
24-
- TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
21+
# Specialized factors for py37.
22+
- TOXENV=py37-pexpect,py37-trial,py37-numpy
23+
- TOXENV=py37-xdist
24+
- TOXENV=py37-pluggymaster PYTEST_NO_COVERAGE=1
25+
- TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
2526

2627
jobs:
2728
include:
@@ -31,10 +32,7 @@ jobs:
3132
dist: trusty
3233
- env: TOXENV=py35
3334
python: '3.5'
34-
- env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1
35-
python: '3.6'
3635
- env: TOXENV=py37
37-
python: '3.7'
3836
- &test-macos
3937
language: generic
4038
os: osx
@@ -56,7 +54,9 @@ jobs:
5654
- env: TOXENV=py34
5755
python: '3.4'
5856
- env: TOXENV=py36
57+
python: '3.6'
5958
- env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
59+
python: '3.7'
6060

6161
- stage: deploy
6262
python: '3.6'

CONTRIBUTING.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Short version
169169
#. Follow **PEP-8** for naming and `black <https://github.com/ambv/black>`_ for formatting.
170170
#. Tests are run using ``tox``::
171171

172-
tox -e linting,py27,py36
172+
tox -e linting,py27,py37
173173

174174
The test environments above are usually enough to cover most cases locally.
175175

@@ -237,12 +237,12 @@ Here is a simple overview, with pytest-specific bits:
237237

238238
#. Run all the tests
239239

240-
You need to have Python 2.7 and 3.6 available in your system. Now
240+
You need to have Python 2.7 and 3.7 available in your system. Now
241241
running tests is as simple as issuing this command::
242242

243-
$ tox -e linting,py27,py36
243+
$ tox -e linting,py27,py37
244244

245-
This command will run tests via the "tox" tool against Python 2.7 and 3.6
245+
This command will run tests via the "tox" tool against Python 2.7 and 3.7
246246
and also perform "lint" coding-style checks.
247247

248248
#. You can now edit your local working copy and run the tests again as necessary. Please follow PEP-8 for naming.
@@ -252,9 +252,9 @@ Here is a simple overview, with pytest-specific bits:
252252

253253
$ tox -e py27 -- --pdb
254254

255-
Or to only run tests in a particular test module on Python 3.6::
255+
Or to only run tests in a particular test module on Python 3.7::
256256

257-
$ tox -e py36 -- testing/test_config.py
257+
$ tox -e py37 -- testing/test_config.py
258258

259259

260260
When committing, ``pre-commit`` will re-format the files if necessary.

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ environment:
1414
- TOXENV: "py27-pluggymaster"
1515
PYTEST_NO_COVERAGE: "1"
1616
- TOXENV: "py27-xdist"
17-
# Specialized factors for py36.
18-
- TOXENV: "py36-trial,py36-numpy"
19-
- TOXENV: "py36-pluggymaster"
17+
# Specialized factors for py37.
18+
- TOXENV: "py37-trial,py37-numpy"
19+
- TOXENV: "py37-pluggymaster"
2020
PYTEST_NO_COVERAGE: "1"
21-
- TOXENV: "py36-freeze"
21+
- TOXENV: "py37-freeze"
2222
PYTEST_NO_COVERAGE: "1"
23-
- TOXENV: "py36-xdist"
23+
- TOXENV: "py37-xdist"
2424

2525
matrix:
2626
fast_finish: true

tox.ini

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ envlist =
1010
py36
1111
py37
1212
pypy
13-
{py27,py36}-{pexpect,xdist,trial,numpy,pluggymaster}
13+
{py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster}
1414
py27-nobyte
1515
doctesting
16-
py36-freeze
16+
py37-freeze
1717
docs
1818

1919
[testenv]
@@ -23,7 +23,7 @@ commands =
2323
coverage: coverage report
2424
passenv = USER USERNAME COVERAGE_* TRAVIS
2525
setenv =
26-
# configuration if a user runs tox with a "coverage" factor, for example "tox -e py36-coverage"
26+
# configuration if a user runs tox with a "coverage" factor, for example "tox -e py37-coverage"
2727
coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
2828
coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
2929
coverage: COVERAGE_FILE={toxinidir}/.coverage
@@ -60,7 +60,7 @@ deps =
6060
commands =
6161
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs}
6262

63-
[testenv:py36-xdist]
63+
[testenv:py37-xdist]
6464
# NOTE: copied from above due to https://github.com/tox-dev/tox/issues/706.
6565
deps =
6666
pytest-xdist>=1.13
@@ -78,7 +78,7 @@ deps =
7878
commands =
7979
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py {posargs}
8080

81-
[testenv:py36-pexpect]
81+
[testenv:py37-pexpect]
8282
platform = {[testenv:py27-pexpect]platform}
8383
deps = {[testenv:py27-pexpect]deps}
8484
commands = {[testenv:py27-pexpect]commands}
@@ -103,7 +103,7 @@ deps =
103103
commands =
104104
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
105105

106-
[testenv:py36-trial]
106+
[testenv:py37-trial]
107107
deps = {[testenv:py27-trial]deps}
108108
commands = {[testenv:py27-trial]commands}
109109

@@ -114,7 +114,7 @@ deps =
114114
commands=
115115
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py}
116116

117-
[testenv:py36-numpy]
117+
[testenv:py37-numpy]
118118
deps = {[testenv:py27-numpy]deps}
119119
commands = {[testenv:py27-numpy]commands}
120120

@@ -125,7 +125,7 @@ setenv=
125125
# NOTE: using env instead of "{[testenv]deps}", because of https://github.com/tox-dev/tox/issues/706.
126126
_PYTEST_TOX_EXTRA_DEP=git+https://github.com/pytest-dev/pluggy.git@master
127127

128-
[testenv:py36-pluggymaster]
128+
[testenv:py37-pluggymaster]
129129
setenv = {[testenv:py27-pluggymaster]setenv}
130130

131131
[testenv:docs]
@@ -170,7 +170,7 @@ changedir = testing
170170
commands =
171171
{envpython} {envbindir}/py.test-jython {posargs}
172172

173-
[testenv:py36-freeze]
173+
[testenv:py37-freeze]
174174
changedir = testing/freeze
175175
deps =
176176
pyinstaller

0 commit comments

Comments
 (0)