Skip to content

Commit

Permalink
Added support for Django 1.10
Browse files Browse the repository at this point in the history
ECOM-5769
  • Loading branch information
clintonb committed Nov 3, 2016
1 parent f1cf292 commit 3836548
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ python:
env:
- TOXENV=django18
- TOXENV=django19
- TOXENV=django110

matrix:
include:
Expand Down Expand Up @@ -37,4 +38,4 @@ deploy:
on:
tags: true
python: 3.5
condition: '$TOXENV = django19'
condition: '$TOXENV = django110'
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.1.1' # pragma: no cover
__version__ = '1.2.0' # pragma: no cover
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
],
packages=['edx_rest_framework_extensions'],
install_requires=[
'django>=1.8.9,<1.10',
'django>=1.8.9,<1.11',
'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}, quality, docs
envlist = py{27,35}-django{18,19,110}, quality, docs

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

commands =
Expand Down

0 comments on commit 3836548

Please sign in to comment.