Skip to content

Commit

Permalink
Added suppoer for django 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahsan Ulhaq committed May 31, 2017
1 parent 017ba07 commit 1db9f5e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ env:
- TOXENV=django18
- TOXENV=django19
- TOXENV=django110
- TOXENV=django111

matrix:
include:
- python: 3.5
- python: 3.6
env: TOXENV=quality,docs
python: 3.6
env: TOXENV=django111

cache:
- pip
Expand All @@ -37,5 +40,5 @@ deploy:
distributions: sdist bdist_wheel
on:
tags: true
python: 3.5
condition: '$TOXENV = django110'
python: 3.6
condition: '$TOXENV = django111'
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ for developing on the edX platform.
Requirements
------------

* Python (2.7, 3.5)
* Django (1.8, 1.9)
* Python (2.7, 3.5, 3.6)
* Django (1.8, 1.9, 1.10, 1.11)
* Django REST Framework (3.2+)

Installation
Expand Down
2 changes: 1 addition & 1 deletion edx_rest_framework_extensions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" edx Django REST Framework extensions. """

__version__ = '1.2.2' # pragma: no cover
__version__ = '1.2.3' # pragma: no cover
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
],
packages=['edx_rest_framework_extensions'],
install_requires=[
'django>=1.8.9,<1.11',
'django>=1.8.9,<2.0',
'djangorestframework>=3.2.3,<4.0.0',
'djangorestframework-jwt>=1.7.2,<2.0.0',
'python-dateutil>=2.0',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{27,35}-django{18,19,110}, quality, docs
envlist = py{27,35}-django{18,19,110,111}, py36-django111, quality, docs

[testenv]
setenv =
Expand All @@ -10,6 +10,7 @@ deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
-rtest_requirements.txt

commands =
Expand Down

0 comments on commit 1db9f5e

Please sign in to comment.