Skip to content

Commit 191c91a

Browse files
committed
compatibility with Django1.7
1 parent ab745b6 commit 191c91a

File tree

4 files changed

+63
-8
lines changed

4 files changed

+63
-8
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
language: python
22
python: 2.7
33
env:
4+
- TOX_ENV=py26-1.3
5+
- TOX_ENV=py26-1.4
6+
- TOX_ENV=py26-1.5
7+
- TOX_ENV=py26-1.6
48
- TOX_ENV=py27-1.3
59
- TOX_ENV=py27-1.4
610
- TOX_ENV=py27-1.5
711
- TOX_ENV=py27-1.6
12+
- TOX_ENV=py27-1.7
813
- TOX_ENV=py33-1.5
914
- TOX_ENV=py33-1.6
15+
- TOX_ENV=py33-1.7
16+
- TOX_ENV=py34-1.7
1017
install:
1118
- pip install tox
1219
script:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Django-data-exports
77

88
* Author: Mathieu Agopian and contributors_
99
* Licence: BSD
10-
* Compatibility: Python 2.7, Python 3.3, Django 1.3+ (class-based-views required)
10+
* Compatibility: Python 2.6, Python 2.7, Python 3.3, Python 3.4, Django 1.3+ (class-based-views required)
1111
* Requirements: django-inspect-model
1212
* Project URL: https://github.com/magopian/django-data-exports/
1313
* Documentation: http://django-data-exports.readthedocs.org/en/latest/

data_exports/test_settings.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@
1010
]
1111
SECRET_KEY = "not really secret, is it?"
1212
ROOT_URLCONF = 'data_exports.test_urls'
13+
MIDDLEWARE_CLASSES = (
14+
'django.middleware.common.CommonMiddleware',
15+
'django.middleware.csrf.CsrfViewMiddleware',
16+
'django.contrib.sessions.middleware.SessionMiddleware',
17+
'django.contrib.auth.middleware.AuthenticationMiddleware',
18+
'django.contrib.messages.middleware.MessageMiddleware',
19+
)

tox.ini

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27-1.3, py27-1.4, py27-1.5, py27-1.6, py33-1.5, py33-1.6
2+
envlist = py26-1.3, py26-1.4, py26-1.5, py26-1.6, py27-1.3, py27-1.4, py27-1.5, py27-1.6, py27-1.7, py33-1.5, py33-1.6, py33-1.7, py34-1.7
33
toxworkdir = {homedir}/.tox-django-data-exports
44

55
[testenv]
@@ -12,6 +12,30 @@ deps =
1212
coverage
1313
flake8
1414

15+
[testenv:py26-1.3]
16+
basepython = python2.6
17+
deps =
18+
Django==1.3.7
19+
{[testenv]deps}
20+
21+
[testenv:py26-1.4]
22+
basepython = python2.6
23+
deps =
24+
Django==1.4.15
25+
{[testenv]deps}
26+
27+
[testenv:py26-1.5]
28+
basepython = python2.6
29+
deps =
30+
Django==1.5.10
31+
{[testenv]deps}
32+
33+
[testenv:py26-1.6]
34+
basepython = python2.6
35+
deps =
36+
Django==1.6.7
37+
{[testenv]deps}
38+
1539
[testenv:py27-1.3]
1640
basepython = python2.7
1741
deps =
@@ -21,30 +45,47 @@ deps =
2145
[testenv:py27-1.4]
2246
basepython = python2.7
2347
deps =
24-
Django==1.4.10
48+
Django==1.4.15
2549
{[testenv]deps}
2650

27-
2851
[testenv:py27-1.5]
2952
basepython = python2.7
3053
deps =
31-
Django==1.5.5
54+
Django==1.5.10
3255
{[testenv]deps}
3356

3457
[testenv:py27-1.6]
3558
basepython = python2.7
3659
deps =
37-
Django==1.6
60+
Django==1.6.7
61+
{[testenv]deps}
62+
63+
[testenv:py27-1.7]
64+
basepython = python2.7
65+
deps =
66+
Django==1.7
3867
{[testenv]deps}
3968

4069
[testenv:py33-1.5]
4170
basepython = python3.3
4271
deps =
43-
Django==1.5.5
72+
Django==1.5.10
4473
{[testenv]deps}
4574

4675
[testenv:py33-1.6]
4776
basepython = python3.3
4877
deps =
49-
Django==1.6
78+
Django==1.6.7
79+
{[testenv]deps}
80+
81+
[testenv:py33-1.7]
82+
basepython = python3.3
83+
deps =
84+
Django==1.7
85+
{[testenv]deps}
86+
87+
[testenv:py34-1.7]
88+
basepython = python3.4
89+
deps =
90+
Django==1.7
5091
{[testenv]deps}

0 commit comments

Comments
 (0)