Skip to content

Commit 2359b18

Browse files
committed
Update test config
* Add Django 2.0 to test matrix * Add test for docs and readme
1 parent 350d981 commit 2359b18

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ env:
99
- DJANGO=1.9
1010
- DJANGO=1.10
1111
- DJANGO=1.11
12+
- DJANGO=2.0
1213
matrix:
1314
exclude:
1415
# Python/Django combinations that aren't officially supported
1516
- { python: 3.6, env: DJANGO=1.8 }
1617
- { python: 3.6, env: DJANGO=1.9 }
1718
- { python: 3.6, env: DJANGO=1.10 }
19+
- { python: 2.7, env: DJANGO=2.0 }
1820
include:
19-
- { python: 2.7, env: TOXENV=flake8 }
21+
- { python: 3.6, env: TOXENV=flake8 }
22+
- { python: 3.6, env: TOXENV=readme }
2023

2124
install:
2225
- pip install tox-travis

tox.ini

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,44 @@ envlist =
99
py{27,34,35}-django18
1010
py{27,34,35}-django110
1111
py{27,34,35,36}-django111
12+
py{34,35,36}-django20
13+
docs
14+
readme
1215

1316
[testenv]
1417
deps =
1518
django18: Django>=1.8,<1.9
1619
django110: Django>=1.10,<1.11
1720
django111: Django>=1.11,<2.0
21+
django20: Django>=2.0,<2.1
1822
py27: mock
1923
commands =
2024
python runtests.py
2125

26+
[testenv:docs]
27+
changedir = docs
28+
deps =
29+
sphinx
30+
sphinx-autobuild
31+
sphinx_rtd_theme
32+
whitelist_externals = make
33+
commands = make html
34+
2235
[testenv:flake8]
23-
basepython = python
2436
deps = flake8
25-
commands =
26-
flake8
37+
commands = flake8
38+
39+
[testenv:readme]
40+
deps = readme_renderer
41+
commands = python setup.py check --restructuredtext --strict
42+
43+
[travis:env]
44+
DJANGO =
45+
1.8: django18
46+
1.9: django19
47+
1.10: django110
48+
1.11: django111
49+
2.0: django20
2750

2851
[flake8]
2952
exclude =
@@ -38,5 +61,4 @@ exclude =
3861
.ropeproject,
3962
runtests.py
4063
setup.py,
41-
4264
max-line-length = 80

0 commit comments

Comments
 (0)