Skip to content

Commit 5fbdfa0

Browse files
committed
Fix for travis.
1 parent d375580 commit 5fbdfa0

File tree

2 files changed

+26
-42
lines changed

2 files changed

+26
-42
lines changed

.travis.yml

+12-36
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,25 @@
11
sudo: false
2-
dist: bionic
3-
42
language: python
3+
54
python:
6-
- '3.5'
5+
- "3.5"
6+
- "3.6"
7+
- "3.7"
8+
- "3.8"
79

810
env:
9-
- TOXENV=flake8
10-
- TOXENV=py35-django20
11-
- TOXENV=py37-django20
12-
- TOXENV=py35-django21
13-
- TOXENV=py37-django21
14-
- TOXENV=py35-django22
15-
- TOXENV=py38-django22
16-
- TOXENV=py36-django30
17-
- TOXENV=py38-django30
18-
19-
matrix:
20-
fast_finish: true
21-
include:
22-
- python: '3.5'
23-
env: TOX_ENV=flake8
24-
- python: '3.5'
25-
env: TOXENV=py35-django20
26-
- python: '3.7'
27-
env: TOXENV=py37-django20
28-
- python: '3.5'
29-
env: TOXENV=py35-django21
30-
- python: '3.7'
31-
env: TOXENV=py37-django21
32-
- python: '3.5'
33-
env: TOXENV=py35-django22
34-
- python: '3.8'
35-
env: TOXENV=py38-django22
36-
- python: '3.6'
37-
env: TOXENV=py36-django30
38-
- python: '3.8'
39-
env: TOXENV=py38-django30
11+
- DJANGO="2.0"
12+
- DJANGO="2.1"
13+
- DJANGO="2.2"
14+
- DJANGO="3.0"
4015

4116
before_install:
4217
- pip install codecov
4318

44-
install: pip install -U tox
19+
install:
20+
- pip install -U tox-travis
4521

46-
script: tox -e ${TOXENV}
22+
script: tox
4723

4824
after_success:
4925
- codecov

tox.ini

+14-6
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@ deps =
1919
django22: Django>=2.2,<3.0
2020
django30: Django>=3.0
2121
-r{toxinidir}/requirements/test.pip
22-
basepython =
23-
py38: python3.8
24-
py37: python3.7
25-
py36: python3.6
26-
py35: python3.5
2722

2823
[testenv:flake8]
29-
basepython=python3.5
3024
deps=flake8
3125
commands=flake8 qurl_templatetag tests
26+
27+
[travis]
28+
python =
29+
3.5: py35, flake8
30+
3.6: py36
31+
3.7: py37
32+
3.8: py38
33+
34+
[travis:env]
35+
DJANGO =
36+
2.0: django20
37+
2.1: django21
38+
2.2: django22
39+
3.0: django30

0 commit comments

Comments
 (0)