Skip to content

django-rest-framework 3.3 support/tests #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2015
Merged

django-rest-framework 3.3 support/tests #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2166e4c
fix OrderedDict import for drf3.3
jamesturk Oct 29, 2015
075ac72
start testing on drf3.3
jamesturk Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@ script: tox
env:
- TOXENV=py27-django17-drf31
- TOXENV=py27-django17-drf32
- TOXENV=py32-django17-drf31
- TOXENV=py32-django17-drf32
- TOXENV=py33-django17-drf31
- TOXENV=py33-django17-drf32
- TOXENV=py34-django17-drf31
- TOXENV=py34-django17-drf32
- TOXENV=py27-django18-drf31
- TOXENV=py27-django18-drf32
- TOXENV=py32-django18-drf31
- TOXENV=py32-django18-drf32
- TOXENV=py27-django18-drf33
- TOXENV=py33-django18-drf31
- TOXENV=py33-django18-drf32
- TOXENV=py33-django18-drf33
- TOXENV=py34-django18-drf31
- TOXENV=py34-django18-drf32
- TOXENV=py34-django18-drf33
- TOXENV=py27-django19-drf31
- TOXENV=py27-django19-drf32
- TOXENV=py27-django19-drf33
- TOXENV=py34-django19-drf31
- TOXENV=py34-django19-drf32
- TOXENV=py34-django19-drf33
- TOXENV=py35-django19-drf31
- TOXENV=py35-django19-drf32
- TOXENV=py35-django19-drf33
2 changes: 1 addition & 1 deletion rest_framework_json_api/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""
Pagination fields
"""
from collections import OrderedDict
from rest_framework import serializers
from rest_framework.views import Response
from rest_framework.compat import OrderedDict
from rest_framework.pagination import PageNumberPagination
from rest_framework.templatetags.rest_framework import replace_query_param

Expand Down
2 changes: 1 addition & 1 deletion rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
Utils.
"""
import copy
from collections import OrderedDict

import inflection
from django.conf import settings
from django.utils import six, encoding
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import OrderedDict
from rest_framework.serializers import BaseSerializer, ListSerializer, ModelSerializer
from rest_framework.relations import RelatedField, HyperlinkedRelatedField, PrimaryKeyRelatedField, \
HyperlinkedIdentityField
Expand Down
11 changes: 6 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[tox]
envlist =
py{27,32,33,34}-django17-drf{31,32},
py{27,32,33,34}-django18-drf{31,32},
py{27,34,35}-django19-drf{31,32},
py{27,33,34}-django17-drf{31,32},
py{27,33,34}-django18-drf{31,32,33},
py{27,34,35}-django19-drf{31,32,33},

[testenv]
deps =
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
django19: Django>=1.9a1
django19: Django>=1.9b1
drf31: djangorestframework>=3.1,<3.2
drf32: djangorestframework>=3.2
drf32: djangorestframework>=3.2,<3.3
drf33: djangorestframework>=3.3,<3.4
-r{toxinidir}/requirements-development.txt

setenv= DJANGO_SETTINGS_MODULE=example.settings.test
Expand Down