Skip to content

Commit

Permalink
Add compatibility for Django 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
thoas committed Sep 16, 2014
1 parent c346d70 commit 95af51c
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 27 deletions.
7 changes: 5 additions & 2 deletions README.rst
Expand Up @@ -13,14 +13,17 @@ Compatibility

This library is compatible with:

- python2.6, django1.4
- python2.6, django1.5
- python2.6, django1.6
- python2.7, django1.4
- python2.7, django1.5
- python2.7, django1.6
- python2.7, django1.7
- python3.3, django1.5
- python3.3, django1.6
- python3.3, django1.7
- python3.4, django1.5
- python3.4, django1.6
- python3.4, django1.7

Installation
------------
Expand Down
2 changes: 1 addition & 1 deletion separatedvaluesfield/__init__.py
@@ -1,3 +1,3 @@
version = (0, 1)
version = (0, 2)

__version__ = '.'.join(map(str, version))
9 changes: 9 additions & 0 deletions separatedvaluesfield/tests/settings.py
Expand Up @@ -22,3 +22,12 @@

if django.VERSION <= (1, 6):
TEST_RUNNER = 'discover_runner.DiscoverRunner'

MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
64 changes: 40 additions & 24 deletions tox.ini
@@ -1,24 +1,15 @@
[tox]
envlist =
py26-1.4.X, py26-1.5.X, py26-1.6.X, py27-1.4.X, py27-1.5.X, py27-1.6.X, py33-1.5.X, py33-1.6.X
py26-1.5.X, py26-1.6.X, py27-1.5.X, py27-1.6.X, py27-1.7.X, py33-1.5.X, py33-1.6.X, py33-1.7.X, py34-1.5.X, py34-1.6.X, py34-1.7.X
downloadcache = .tox/_download/

[testenv:py26-1.4.X]
basepython = python2.6
commands =
make test
deps =
Django>=1.4.1,<1.5
coverage==3.6
django-discover-runner

[testenv:py26-1.5.X]
basepython = python2.6
commands =
make test
deps =
Django>=1.5,<1.6
coverage==3.6
coverage
django-discover-runner

[testenv:py26-1.6.X]
Expand All @@ -27,43 +18,68 @@ commands =
make test
deps =
Django>=1.6,<1.7
coverage==3.6
coverage

[testenv:py27-1.4.X]
[testenv:py27-1.5.X]
basepython = python2.7
commands =
make test
deps =
Django>=1.4.1,<1.5
coverage==3.6
Django>=1.5,<1.6
coverage
django-discover-runner

[testenv:py27-1.5.X]
[testenv:py27-1.6.X]
basepython = python2.7
commands =
make test
deps =
Django>=1.5,<1.6
coverage==3.6
django-discover-runner
Django>=1.6,<1.7
coverage

[testenv:py27-1.6.X]
[testenv:py27-1.7.X]
basepython = python2.7
commands =
make test
deps =
Django>=1.6,<1.7
coverage==3.6
Django>=1.7,<1.8
coverage
django-discover-runner

[testenv:py33-1.5.X]
basepython = python3.3
deps =
Django>=1.5,<1.6
coverage==3.6
coverage
django-discover-runner

[testenv:py33-1.6.X]
basepython = python3.3
deps =
Django>=1.6,<1.7
coverage==3.6
coverage

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

[testenv:py34-1.5.X]
basepython = python3.4
deps =
Django>=1.5,<1.6
coverage
django-discover-runner

[testenv:py34-1.6.X]
basepython = python3.4
deps =
Django>=1.6,<1.7
coverage

[testenv:py34-1.7.X]
basepython = python3.4
deps =
Django>=1.7,<1.8
coverage

0 comments on commit 95af51c

Please sign in to comment.