Skip to content

Commit d654a2f

Browse files
committed
Fix some travis config issues
1 parent 118bf0b commit d654a2f

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
language: python
22

3+
dist: xenial
4+
sudo: required
5+
36
cache: pip
47

58
python:
69
- "2.7"
7-
- "3.4"
810
- "3.5"
911
- "3.6"
10-
11-
sudo: false
12+
- "3.7"
1213

1314
env:
1415
- DJANGO=1.11
@@ -22,18 +23,20 @@ matrix:
2223
- python: "3.6"
2324
env: TOXENV="lint"
2425
exclude:
26+
- python: "3.7"
27+
env: DJANGO=1.11
2528
- python: "2.7"
2629
env: DJANGO=2.0
2730
- python: "2.7"
2831
env: DJANGO=2.1
32+
- python: "3.5"
33+
env: DJANGO=2.1
2934
- python: "2.7"
3035
env: DJANGO=master
31-
- python: "3.4"
32-
env: DJANGO=master
33-
- python: "3.4"
34-
env: DJANGO=2.1
3536
- python: "3.5"
3637
env: DJANGO=master
38+
- python: "3.6"
39+
env: DJANGO=master
3740
allow_failures:
3841
- env: DJANGO=master
3942

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ addopts=--tb=short
55
envlist =
66
py{27,35,36}-django111-drf{35,36,37,38},
77
py{35,36,37}-django20-drf{37,38},
8-
py37-django{21,master}-drf{38,39},
8+
py{36,37}-django21-drf{38,39},
9+
py37-djangomaster-drf39,
910
lint
1011

1112
[travis:env]

0 commit comments

Comments
 (0)