Skip to content

Commit

Permalink
Update version support for django 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mjtamlyn committed Dec 13, 2017
1 parent 1828a37 commit 8762ff5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ env:
- TOX_ENV=py27-django19
- TOX_ENV=py27-django110
- TOX_ENV=py27-django111
- TOX_ENV=py33-django18
- TOX_ENV=py34-django18
- TOX_ENV=py34-django19
- TOX_ENV=py34-django110
- TOX_ENV=py34-django111
- TOX_ENV=py34-djangomaster
- TOX_ENV=py34-django20
- TOX_ENV=py35-django18
- TOX_ENV=py35-django19
- TOX_ENV=py35-django110
- TOX_ENV=py35-django111
- TOX_ENV=py35-django20
- TOX_ENV=py35-djangomaster
matrix:
include:
Expand All @@ -29,6 +29,8 @@ matrix:
python: "3.6"
- env: TOX_ENV=py36-django111
python: "3.6"
- env: TOX_ENV=py36-django20
python: "3.6"
- env: TOX_ENV=py36-djangomaster
python: "3.6"
install: pip install tox
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def read(*parts):
url='https://github.com/python-babel/django-babel/',
packages=find_packages(exclude=('tests',)),
install_requires=[
'django>=1.4,<1.12',
'django>=1.8,<3.0',
'babel>=1.3',
],
classifiers=[
Expand Down
3 changes: 2 additions & 1 deletion tests/testproject/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
'django_babel',
'testproject',
]
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
'django.middleware.locale.LocaleMiddleware',
'django_babel.middleware.LocaleMiddleware',
]
MIDDLEWARE_CLASSES = MIDDLEWARE # backwards compat
TEMPLATES = [
{
'NAME': 'default',
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{34,35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111}, py33-django18, lint, docs
envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,19,110,111,20}, lint, docs

[testenv]
deps =
Expand All @@ -11,7 +11,8 @@ deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<1.12
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
commands = py.test {posargs}

Expand Down

0 comments on commit 8762ff5

Please sign in to comment.