Skip to content

Commit cdf422d

Browse files
authored
Improve CI: drop testing pytest master on py27, use py37 (#438)
Improve CI: drop testing pytest master on py27, use py37
2 parents 9fcf8fa + abec5e6 commit cdf422d

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repos:
44
hooks:
55
- id: black
66
args: [--safe, --quiet]
7-
language_version: python3.6
7+
language_version: python3.7
88
- repo: https://github.com/pre-commit/pre-commit-hooks
99
rev: v1.3.0
1010
hooks:
@@ -21,4 +21,4 @@ repos:
2121
files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|changelog/.*)$
2222
language: python
2323
additional_dependencies: [pygments, restructuredtext_lint]
24-
python_version: python3.6
24+
python_version: python3.7

.travis.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ notifications:
1212
1313

1414
install:
15-
- pip install -U pip
15+
- pip install -U pip setuptools
1616
- pip install tox setuptools_scm
1717
script: tox
1818

@@ -25,13 +25,13 @@ stages:
2525
jobs:
2626
include:
2727
- stage: baseline
28-
python: '3.6'
28+
python: '3.7'
2929
env: TOXENV=linting
3030
cache:
3131
directories:
3232
- $HOME/.cache/pre-commit
33-
- python: '3.6'
34-
env: TOXENV=py36-pytestlatest
33+
- python: '3.7'
34+
env: TOXENV=py37-pytestlatest
3535
- python: '2.7'
3636
env: TOXENV=py27-pytestlatest
3737

@@ -40,19 +40,15 @@ jobs:
4040
env: TOXENV=py34-pytestlatest
4141
- python: "3.5"
4242
env: TOXENV=py35-pytestlatest
43-
- python: "3.7"
44-
env: TOXENV=py37-pytestlatest
45-
- python: "2.7"
46-
env: TOXENV=py27-pytestmaster
47-
- python: "2.7"
48-
env: TOXENV=py27-pytestfeatures
4943
- python: "3.6"
50-
env: TOXENV=py36-pytestmaster
51-
- python: "3.6"
52-
env: TOXENV=py36-pytestfeatures
44+
env: TOXENV=py36-pytestlatest
45+
- python: "3.7"
46+
env: TOXENV=py37-pytestmaster
47+
- python: "3.7"
48+
env: TOXENV=py37-pytestfeatures
5349

5450
- stage: deploy
55-
python: '3.6'
51+
python: '3.7'
5652
env:
5753
install: pip install -U setuptools setuptools_scm
5854
script: skip

appveyor.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ environment:
55
- TOXENV: "py35-pytestlatest"
66
- TOXENV: "py36-pytestlatest"
77
- TOXENV: "py37-pytestlatest"
8-
- TOXENV: "py27-pytestmaster"
9-
- TOXENV: "py36-pytestmaster"
10-
- TOXENV: "py27-pytestfeatures"
11-
- TOXENV: "py36-pytestfeatures"
8+
- TOXENV: "py37-pytestmaster"
9+
- TOXENV: "py37-pytestfeatures"
1210

1311
install:
14-
- C:\Python37\python -m pip install -U pip
12+
- C:\Python37\python -m pip install -U pip setuptools
1513
- C:\Python37\python -m pip install -U tox setuptools_scm
1614

1715
build: false # Not a C# project, build stuff at the test step instead.

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist=
33
linting
44
py{27,34,35,36,37}-pytestlatest
5-
py{27,36}-pytest{master,features}
5+
py37-pytest{master,features}
66

77
[testenv]
88
passenv = USER USERNAME
@@ -24,7 +24,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
2424
[testenv:release]
2525
changedir=
2626
decription = do a release, required posarg of the version number
27-
basepython = python3.6
27+
basepython = python3.7
2828
skipsdist = True
2929
usedevelop = True
3030
passenv = *

0 commit comments

Comments
 (0)