forked from spanner28/django-betterforms
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update tests for python3.4, drop django1.4 support
Tests were failing for django 1.4 which ended its extended support period yesterday, so I removed it from the tests. Tox now supports a much nicer parametrized configuration, so I updated tox.ini to use it. I tried adding Django 1.8 to the tests, but the tests were failing. They should be fixed in a separate commit.
- Loading branch information
1 parent
4effd43
commit 6cc9e98
Showing
2 changed files
with
14 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,77 +1,16 @@ | ||
[tox] | ||
envlist= | ||
py26-dj14, | ||
py27-dj14, | ||
py27-dj15, | ||
py27-dj16, | ||
py27-dj17, | ||
py33-dj15, | ||
py33-dj16, | ||
py33-dj17 | ||
{py27,py34}-{dj15,dj16,dj17} | ||
|
||
[testenv] | ||
commands=/usr/bin/env make test | ||
|
||
[testenv:py27-dj14] | ||
basepython=python2.7 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.4.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py27-dj15] | ||
basepython=python2.7 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.5.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py27-dj16] | ||
basepython=python2.7 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.6.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py27-dj17] | ||
basepython=python2.7 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.7.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py33-dj15] | ||
basepython=python3.3 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.5.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py33-dj16] | ||
basepython=python3.3 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.6.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py33-dj17] | ||
basepython=python3.3 | ||
deps = | ||
https://github.com/django/django/archive/stable/1.7.x.zip#egg=Django | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
mock | ||
six | ||
|
||
[testenv:py26-dj14] | ||
basepython=python2.6 | ||
deps = | ||
Django==1.4.8 | ||
# https://bitbucket.org/hpk42/tox/issue/13/tox-should-reuse-tests_require | ||
commands= | ||
/usr/bin/env make test | ||
basepython= | ||
py27: python2.7 | ||
py34: python3.4 | ||
deps = | ||
dj15: Django>=1.5,<1.6 | ||
dj16: Django>=1.6,<1.7 | ||
dj17: Django>=1.7,<1.8 | ||
mock | ||
six |