Skip to content

Commit c204ed3

Browse files
committed
Revert commit 02622ff. Dunno why I thought to do this against master.
See branch fiddling_with_django14 for a bunch of work to try and attempt it, only for me to discover I need partial cleaned_data which didn't exist in 1.4
1 parent 02622ff commit c204ed3

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ cache:
1414
- $HOME/.cache/pip
1515

1616
env:
17-
- TOX_ENV=py27-django14
17+
- TOX_ENV=py27-django17
1818
- TOX_ENV=py27-django18
1919
- TOX_ENV=py27-django19
2020
- TOX_ENV=py27-django110
2121
- TOX_ENV=py27-django111
22+
- TOX_ENV=py33-django17
2223
- TOX_ENV=py33-django18
2324
- TOX_ENV=py34-django18
2425
- TOX_ENV=py34-django19
@@ -28,14 +29,11 @@ env:
2829
- TOX_ENV=py35-django19
2930
- TOX_ENV=py35-django110
3031
- TOX_ENV=py35-django111
32+
- TOX_ENV=pypy-django17
3133
- TOX_ENV=pypy-django18
3234
- TOX_ENV=pypy-django19
3335
- TOX_ENV=pypy-django110
3436
- TOX_ENV=pypy-django111
3537

3638
script:
3739
- tox -e $TOX_ENV
38-
39-
matrix:
40-
allow_failures:
41-
- env: TOXENV=py27-django14

tox.ini

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
2-
minversion=2.2
3-
envlist = py27-django{14,18,19,110,111},
4-
py33-django{18},
2+
minversion=1.8
3+
envlist = py27-django{17,18,19,110,111},
4+
py33-django{17,18},
55
py34-django{18,19,110,111},
66
py35-django{18,19,110,111},
7-
pypy-django{18,19,110,111},
7+
pypy-django{17,18,19,110,111},
88

99
[testenv]
1010
usedevelop = True
@@ -17,7 +17,6 @@ basepython =
1717
pypy: pypy
1818

1919
deps =
20-
django14: Django>=1.4,<1.5
2120
django17: Django>=1.7,<1.8
2221
django17: djangorestframework==3.3.2
2322
django18: Django>=1.8,<1.9
@@ -26,6 +25,3 @@ deps =
2625
django111: Django>=1.11a,<2.0
2726
commands =
2827
python -tt -W ignore setup.py test
29-
30-
[testenv:py27-django14]
31-
ignore_outcome = true

0 commit comments

Comments
 (0)