Skip to content

Commit 48ca600

Browse files
committed
Run tests against Django 1.9+
1 parent c803abf commit 48ca600

File tree

3 files changed

+56
-97
lines changed

3 files changed

+56
-97
lines changed

.travis.yml

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,32 @@ python:
99
- 3.5
1010

1111
env:
12-
- DJANGO=1.6
13-
- DJANGO=1.7
14-
- DJANGO=1.8
15-
16-
matrix:
17-
exclude:
18-
- python: 3.5
19-
env: DJANGO=1.6
20-
- python: 3.5
21-
env: DJANGO=1.7
22-
include:
23-
- python: 3.4
24-
env: DJANGO=1.8 COVERAGE=true COVERALLS_REPO_TOKEN=LdECqqwg7eelQx9w8gvooUZCFIaCqGZCv
25-
allow_failures:
26-
- env: COVERAGE=true
12+
matrix:
13+
- ENV=py27-django1.5
14+
- ENV=py27-django1.6
15+
- ENV=py27-django1.7
16+
- ENV=py27-django1.8
17+
- ENV=py27-django1.9
18+
- ENV=py27-django1.10
19+
- ENV=py27-django1.11
20+
- ENV=py33-django1.5
21+
- ENV=py33-django1.6
22+
- ENV=py33-django1.7
23+
- ENV=py33-django1.8
24+
- ENV=py34-django1.5
25+
- ENV=py34-django1.6
26+
- ENV=py34-django1.7
27+
- ENV=py34-django1.8
28+
- ENV=py34-django1.9
29+
- ENV=py34-django1.10
30+
- ENV=py34-django1.11
31+
- ENV=py35-django1.8
32+
- ENV=py35-django1.9
33+
- ENV=py35-django1.10
34+
- ENV=py35-django1.11
35+
- ENV=coverage
2736

2837
install:
29-
- pip install flake8
30-
- pip install -q "Django>=$DJANGO,<$DJANGO.99"
31-
- make install
32-
33-
script:
34-
- make flake8
35-
- make test
36-
37-
after_script:
38-
- if [ "$COVERAGE" == "true" ]; then
39-
pip install --quiet python-coveralls;
40-
make coverage;
41-
coverage report;
42-
coveralls --ignore-errors;
43-
fi
38+
- pip install tox
4439

45-
notifications:
46-
email:
47-
40+
script: tox -e $ENV

django_enumfield/tests/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
urlpatterns = ()

tox.ini

Lines changed: 29 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,32 @@
11
[tox]
2-
envlist = py27_django15, py27_django16, py27_django17, py27_django18,
3-
py33_django15, py33_django16, py33_django17, py33_django18,
4-
py34_django15, py34_django16, py34_django17, py34_django18
2+
envlist =
3+
py{27,34}-django{15,16,17,18,19,110,111}
4+
py33-django{15,16,17,18}
5+
py35-django{18,19,110,111}
6+
coverage
57

68
[testenv]
7-
commands = {envpython} setup.py test
8-
9-
[testenv:py27_django15]
10-
basepython = python2.7
11-
deps =
12-
Django==1.5.7
13-
14-
[testenv:py27_django16]
15-
basepython = python2.7
16-
deps =
17-
Django==1.6.4
18-
19-
[testenv:py27_django17]
20-
basepython = python2.7
21-
deps =
22-
Django==1.7.1
23-
24-
[testenv:py27_django18]
25-
basepython = python2.7
26-
deps =
27-
Django==1.8.1
28-
29-
[testenv:py33_django15]
30-
basepython = python3.3
31-
deps =
32-
Django==1.5.7
33-
34-
[testenv:py33_django16]
35-
basepython = python3.3
36-
deps =
37-
Django==1.6.4
38-
39-
[testenv:py33_django17]
40-
basepython = python3.3
41-
deps =
42-
Django==1.7.1
43-
44-
[testenv:py33_django18]
45-
basepython = python3.3
46-
deps =
47-
Django==1.8.1
48-
49-
[testenv:py34_django15]
50-
basepython = python3.4
51-
deps =
52-
Django==1.5.7
53-
54-
[testenv:py34_django16]
55-
basepython = python3.4
56-
deps =
57-
Django==1.6.4
58-
59-
[testenv:py34_django17]
60-
basepython = python3.4
61-
deps =
62-
Django==1.7.1
63-
64-
[testenv:py34_django18]
65-
basepython = python3.4
66-
deps =
67-
Django==1.8.1
9+
deps=
10+
django15: Django>=1.5,<1.6
11+
django16: Django>=1.6,<1.7
12+
django17: Django>=1.7,<1.8
13+
django18: Django>=1.8,<1.9
14+
django19: Django>=1.9,<1.10
15+
django110: Django>=1.10,<1.11
16+
django111: Django>=1.11,<1.12
17+
commands = make test
18+
19+
[testenv:coverage]
20+
basepython = python3.5
21+
passenv = TOXENV CI TRAVIS TRAVIS_*
22+
deps =
23+
Django>=1.8,<1.9
24+
flake8
25+
python-coveralls
26+
setenv =
27+
COVERALLS_REPO_TOKEN=LdECqqwg7eelQx9w8gvooUZCFIaCqGZCv
28+
commands =
29+
make flake8
30+
make coverage
31+
coverage report
32+
coveralls --ignore-errors

0 commit comments

Comments
 (0)