Skip to content

Commit 8762ff5

Browse files
committed
Update version support for django 2.0
1 parent 1828a37 commit 8762ff5

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ env:
88
- TOX_ENV=py27-django19
99
- TOX_ENV=py27-django110
1010
- TOX_ENV=py27-django111
11-
- TOX_ENV=py33-django18
1211
- TOX_ENV=py34-django18
1312
- TOX_ENV=py34-django19
1413
- TOX_ENV=py34-django110
1514
- TOX_ENV=py34-django111
16-
- TOX_ENV=py34-djangomaster
15+
- TOX_ENV=py34-django20
1716
- TOX_ENV=py35-django18
1817
- TOX_ENV=py35-django19
1918
- TOX_ENV=py35-django110
2019
- TOX_ENV=py35-django111
20+
- TOX_ENV=py35-django20
2121
- TOX_ENV=py35-djangomaster
2222
matrix:
2323
include:
@@ -29,6 +29,8 @@ matrix:
2929
python: "3.6"
3030
- env: TOX_ENV=py36-django111
3131
python: "3.6"
32+
- env: TOX_ENV=py36-django20
33+
python: "3.6"
3234
- env: TOX_ENV=py36-djangomaster
3335
python: "3.6"
3436
install: pip install tox

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def read(*parts):
2424
url='https://github.com/python-babel/django-babel/',
2525
packages=find_packages(exclude=('tests',)),
2626
install_requires=[
27-
'django>=1.4,<1.12',
27+
'django>=1.8,<3.0',
2828
'babel>=1.3',
2929
],
3030
classifiers=[

tests/testproject/settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
'django_babel',
88
'testproject',
99
]
10-
MIDDLEWARE_CLASSES = [
10+
MIDDLEWARE = [
1111
'django.middleware.locale.LocaleMiddleware',
1212
'django_babel.middleware.LocaleMiddleware',
1313
]
14+
MIDDLEWARE_CLASSES = MIDDLEWARE # backwards compat
1415
TEMPLATES = [
1516
{
1617
'NAME': 'default',

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{34,35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111}, py33-django18, lint, docs
2+
envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111,20}, lint, docs
33

44
[testenv]
55
deps =
@@ -11,7 +11,8 @@ deps =
1111
django18: Django>=1.8,<1.9
1212
django19: Django>=1.9,<1.10
1313
django110: Django>=1.10,<1.11
14-
django111: Django>=1.11,<1.12
14+
django111: Django>=1.11,<2.0
15+
django20: Django>=2.0,<2.1
1516
djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
1617
commands = py.test {posargs}
1718

0 commit comments

Comments
 (0)