Skip to content

Commit

Permalink
Test against Django 1.8
Browse files Browse the repository at this point in the history
Drop support for unsupported versions of Django.

Point django-nose to git version, PyPI version is incompatible with
Django 1.8
  • Loading branch information
bennylope committed Apr 12, 2015
1 parent 03a58f0 commit 6cdea81
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 72 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ python: 2.7
env:
- TOX_ENV=flake8
- TOX_ENV=py27-django14
- TOX_ENV=py27-django15
- TOX_ENV=py27-django16
- TOX_ENV=py27-django17
- TOX_ENV=py33-django15
- TOX_ENV=py33-django16
- TOX_ENV=py33-django17
- TOX_ENV=py33-django18
- TOX_ENV=py34-django17
- TOX_ENV=py34-django18
- TOX_ENV=pypy-django17
- TOX_ENV=pypy-django18
install:
- pip install tox
script:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ coverage
wheel
mock>=1.0.1
nose>=1.3.0
django-nose>=1.2
git+git://github.com/django-nose/django-nose.git#egg=django-nose
82 changes: 15 additions & 67 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,78 +1,26 @@
[tox]
envlist =
flake8,
py27-django14,
py27-django16,
py27-django17,
py33-django16,
py34-django17,
pypy-django17
py27-django{14,17,18},
py33-django{17,18},
py34-django{17,18}

[testenv]
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/example
commands = python runtests.py
deps =
-r{toxinidir}/requirements.txt

[testenv:py27-django14]
basepython = python2.7
deps =
Django>=1.4,<1.5
-r{toxinidir}/requirements.txt

[testenv:py27-django15]
basepython = python2.7
deps =
Django>=1.5,<1.6
-r{toxinidir}/requirements.txt

[testenv:py27-django16]
basepython = python2.7
deps =
Django>=1.6,<1.7
-r{toxinidir}/requirements.txt

[testenv:py27-django17]
basepython = python2.7
deps =
Django>=1.7,<1.8
-r{toxinidir}/requirements.txt

[testenv:py33-django15]
basepython = python3.3
deps =
Django>=1.5,<1.6
-r{toxinidir}/requirements.txt

[testenv:py33-django16]
basepython = python3.3
deps =
Django>=1.6,<1.7
-r{toxinidir}/requirements.txt

[testenv:py33-django17]
basepython = python3.3
deps =
Django>=1.7,<1.8
-r{toxinidir}/requirements.txt

[testenv:py34-django16]
basepython = python3.4
deps =
Django>=1.6,<1.7
-r{toxinidir}/requirements.txt

[testenv:py34-django17]
basepython = python3.4
deps =
Django>=1.7,<1.8
-r{toxinidir}/requirements.txt

[testenv:pypy-django17]
basepython = pypy
deps =
Django>=1.7,<1.8
basepython =
py27: python2.7
py33: python3.3
py34: python3.4
py35: python3.5
pypy: pypy
deps =
django14: Django>=1.4,<1.5
django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
-r{toxinidir}/requirements.txt

[testenv:flake8]
Expand Down

0 comments on commit 6cdea81

Please sign in to comment.