Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
Noting official support for Django 1.7
Browse files Browse the repository at this point in the history
We can't support Django 1.8 until django-setuptest does, or
until we've switched to just using pytest-django or
something similar.
  • Loading branch information
dominicrodger committed Apr 7, 2015
1 parent fd53bba commit 7db0402
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
language: python
python: 2.7
env:
- TOX_ENV=py33-1.7.X
- TOX_ENV=py33-1.6.X
- TOX_ENV=py33-1.5.X
- TOX_ENV=py27-1.7.X
- TOX_ENV=py27-1.6.X
- TOX_ENV=py27-1.5.X
- TOX_ENV=py27-1.4.X
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ links to the 403, 404, 500 and mail integration pages.
Supported Python and Django versions
------------------------------------

Currently, djohno supports Django 1.4, 1.5, and 1.6. Djohno follows
Django's lead in the versions of Python it supports (i.e. with Django
1.5 and 1.6, djohno will support Python 3).
Currently, djohno supports Django 1.4, 1.5, 1.6 and 1.7. Djohno
follows Django's lead in the versions of Python it supports
(i.e. with Django 1.5 and above, djohno will support Python 3).
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
'Programming Language :: Python :: 3.3',
],
tests_require=(
'django-setuptest==0.1.3',
'django-setuptest==0.1.6',
'mock==1.0.1',
'httpretty==0.6.3',
),
Expand Down
10 changes: 9 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
[tox]
envlist = py33-1.6.X,py33-1.5.X,py27-1.6.X,py27-1.5.X,py27-1.4.X,py26-1.6.X,py26-1.5.X,py26-1.4.X,docs,flake8
envlist = py33-1.7.X,py33-1.6.X,py33-1.5.X,py27-1.7.X,py27-1.6.X,py27-1.5.X,py27-1.4.X,py26-1.6.X,py26-1.5.X,py26-1.4.X,docs,flake8

[testenv]
commands=python setup.py test

[testenv:py33-1.7.X]
basepython = python3.3
deps = django>=1.7,<1.8

[testenv:py33-1.6.X]
basepython = python3.3
deps = django>=1.6,<1.7
Expand All @@ -12,6 +16,10 @@ deps = django>=1.6,<1.7
basepython = python3.3
deps = django>=1.5,<1.6

[testenv:py27-1.7.X]
basepython = python2.7
deps = django>=1.7,<1.8

[testenv:py27-1.6.X]
basepython = python2.7
deps = django>=1.6,<1.7
Expand Down

0 comments on commit 7db0402

Please sign in to comment.