Skip to content

Commit d0b2ac5

Browse files
committed
Test with latest pytest only
1 parent c8bc368 commit d0b2ac5

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.travis.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
language: python
2-
python:
3-
- "2.7"
4-
- "3.4"
5-
- "3.5"
6-
- "3.6"
72

83
install:
9-
- pip install tox-travis coveralls
4+
- pip install -U pip
5+
- pip install tox coveralls
106

117
script:
128
- tox
@@ -21,7 +17,16 @@ stages:
2117

2218
jobs:
2319
include:
20+
- python: '2.7'
21+
env: TOXENV=py27
22+
- python: '3.4'
23+
env: TOXENV=py34
24+
- python: '3.5'
25+
env: TOXENV=py35
26+
- python: '3.6'
27+
env: TOXENV=py36
2428
- python: '3.7'
29+
env: TOXENV=py37
2530
sudo: required
2631
dist: xenial
2732
- python: '3.6'

appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
install:
2-
- C:\Python36\python -m pip install tox
2+
- C:\Python37\python -m pip install -U pip
3+
- C:\Python37\python -m pip install tox
34

45
build: false # Not a C# project
56

67
test_script:
7-
- C:\Python36\scripts\tox
8+
- C:\Python37\scripts\tox
89

910
skip_tags: true

tox.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
[tox]
2-
envlist = py{27,34,35,36,37}-pytest{37,38},linting,norewrite
2+
envlist = py{27,34,35,36,37}, linting, norewrite
33

44
[testenv]
55
passenv = USER USERNAME
66
deps =
77
coverage
8-
pytest37: pytest~=3.7
9-
pytest38: pytest~=3.8
108
commands =
119
coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
1210

0 commit comments

Comments
 (0)