Skip to content

Commit 58f02a1

Browse files
committed
updated support for django and python
1 parent 3a99442 commit 58f02a1

File tree

2 files changed

+20
-81
lines changed

2 files changed

+20
-81
lines changed

.travis.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,20 @@ python: "2.7"
33
sudo: false
44

55
env:
6-
- TOX_ENV=py26-django14
7-
- TOX_ENV=py26-django15
8-
- TOX_ENV=py26-django16
9-
- TOX_ENV=py27-django14
10-
- TOX_ENV=py27-django15
11-
- TOX_ENV=py27-django16
126
- TOX_ENV=py27-django17
137
- TOX_ENV=py27-django18
148
- TOX_ENV=py27-django19
15-
- TOX_ENV=py33-django15
16-
- TOX_ENV=py33-django16
9+
- TOX_ENV=py32-django17
10+
- TOX_ENV=py32-django18
1711
- TOX_ENV=py33-django17
1812
- TOX_ENV=py33-django18
19-
- TOX_ENV=py34-django15
20-
- TOX_ENV=py34-django16
2113
- TOX_ENV=py34-django17
2214
- TOX_ENV=py34-django18
2315
- TOX_ENV=py34-django19
16+
- TOX_ENV=py35-django18
2417
- TOX_ENV=py35-django19
2518
- TOX_ENV=docs
2619

27-
matrix:
28-
# Python 3.5 not yet available on travis, watch this to see when it is.
29-
fast_finish: true
30-
allow_failures:
31-
- env: TOX_ENV=py35-django19
32-
3320
install:
3421
- pip install tox
3522
- pip install coveralls

tox.ini

Lines changed: 17 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
22
envlist =
3-
{py26}-django{14,15,16},
4-
{py27}-django{14,15,16,17,18,19},
5-
{py33}-django{15,16,17,18},
6-
{py34}-django{15,16,17,18,19},
7-
{py35}-django{19},
3+
{py27}-django{17,18,19},
4+
{py32}-django{17,18}
5+
{py33}-django{17,18},
6+
{py34}-django{17,18,19},
7+
{py35}-django{18,19},
88
docs,
99
flake8
1010

@@ -14,46 +14,6 @@ commands=coverage run -a runtests.py
1414
deps =
1515
-r{toxinidir}/requirements/testing.txt
1616

17-
[testenv:py26-django14]
18-
basepython = python2.6
19-
deps =
20-
Django<1.5
21-
django-discover-runner
22-
{[testenv]deps}
23-
24-
[testenv:py26-django15]
25-
basepython = python2.6
26-
deps =
27-
Django<1.6
28-
django-discover-runner
29-
{[testenv]deps}
30-
31-
[testenv:py26-django16]
32-
basepython = python2.6
33-
deps =
34-
Django<1.7
35-
{[testenv]deps}
36-
37-
[testenv:py27-django14]
38-
basepython = python2.7
39-
deps =
40-
Django<1.5
41-
django-discover-runner
42-
{[testenv]deps}
43-
44-
[testenv:py27-django15]
45-
basepython = python2.7
46-
deps =
47-
Django<1.6
48-
django-discover-runner
49-
{[testenv]deps}
50-
51-
[testenv:py27-django16]
52-
basepython = python2.7
53-
deps =
54-
Django<1.7
55-
{[testenv]deps}
56-
5717
[testenv:py27-django17]
5818
basepython = python2.7
5919
deps =
@@ -72,17 +32,16 @@ deps =
7232
git+https://github.com/django/django.git@stable/1.9.x#egg=Django
7333
{[testenv]deps}
7434

75-
[testenv:py33-django15]
76-
basepython = python3.3
35+
[testenv:py32-django17]
36+
basepython = python3.2
7737
deps =
78-
Django<1.6
79-
django-discover-runner
38+
Django<1.8
8039
{[testenv]deps}
8140

82-
[testenv:py33-django16]
83-
basepython = python3.3
41+
[testenv:py32-django18]
42+
basepython = python3.2
8443
deps =
85-
Django<1.7
44+
Django<1.9
8645
{[testenv]deps}
8746

8847
[testenv:py33-django17]
@@ -97,19 +56,6 @@ deps =
9756
Django<1.9
9857
{[testenv]deps}
9958

100-
[testenv:py34-django15]
101-
basepython = python3.4
102-
deps =
103-
Django<1.6
104-
django-discover-runner
105-
{[testenv]deps}
106-
107-
[testenv:py34-django16]
108-
basepython = python3.4
109-
deps =
110-
Django<1.7
111-
{[testenv]deps}
112-
11359
[testenv:py34-django17]
11460
basepython = python3.4
11561
deps =
@@ -128,6 +74,12 @@ deps =
12874
git+https://github.com/django/django.git@stable/1.9.x#egg=Django
12975
{[testenv]deps}
13076

77+
[testenv:py35-django18]
78+
basepython = python3.5
79+
deps =
80+
Django<1.9
81+
{[testenv]deps}
82+
13183
[testenv:py35-django19]
13284
basepython = python3.5
13385
deps =

0 commit comments

Comments
 (0)