Skip to content

Commit

Permalink
Merge pull request #25 from felixxm/django-2.0
Browse files Browse the repository at this point in the history
Added Django 2.1 and DRF 3.9 support.
  • Loading branch information
izimobil committed Nov 16, 2018
2 parents 71f6a4c + d2a61e0 commit e44fb51
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Requirements
------------

- Python (2.7, 3.4, 3.5, 3.6)
- Django (1.9, 1.10, 1.11, 2.0)
- Django REST Framework (3.5, 3.6, 3.7, 3.8)
- Django (1.9, 1.10, 1.11, 2.0, 2.1)
- Django REST Framework (3.5, 3.6, 3.7, 3.8, 3.9)

Quickstart
----------
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@ def get_package_data(package):
'djangorestframework>=3.5.0',
],
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ envlist =
py{27,35}-lint,
py27-django1.9-drf3.{5,6}
py27-django1.{10,11}-drf3.{5,6,7,8}
{py34,py35,py36}-django2.0-drf3.{7,8}
{py34,py35,py36}-django2.0-drf3.{7,8,9}
{py35,py36}-django2.1-drf3.{8,9}

[testenv]
commands = coverage run --source=rest_framework_datatables example/manage.py test --noinput
Expand All @@ -15,10 +16,12 @@ deps =
django1.10: Django>=1.10,<1.11
django1.11: Django>=1.11,<2.0
django2.0: Django>=2.0,<2.1
django2.1: Django>=2.1,<2.2
drf3.5: djangorestframework>=3.5,<3.6
drf3.6: djangorestframework>=3.6,<3.7
drf3.7: djangorestframework>=3.7,<3.8
drf3.8: djangorestframework>=3.8,<3.9
drf3.9: djangorestframework>=3.9,<3.10

[testenv:py27-lint]
commands = pycodestyle rest_framework_datatables
Expand Down

0 comments on commit e44fb51

Please sign in to comment.