Skip to content

Allow compatibility with DRF 3.7 #146

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 3 commits into from
Nov 2, 2017
Merged

Allow compatibility with DRF 3.7 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1974618
Allow compatibility with DRF 3.7
pkolios Oct 18, 2017
39c9781
Fix tests views DjangoFilterBackend import
pkolios Oct 18, 2017
9e57496
Drop support for Django 1.8
pkolios Oct 18, 2017
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
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ matrix:
env: TOXENV=py36-django110
- python: 3.6
env: TOXENV=py36-django19
- python: 3.6
env: TOXENV=py36-django18

- python: 3.5
env: TOXENV=py35-django110
Expand All @@ -33,8 +31,6 @@ matrix:
env: TOXENV=py27-django110
- python: 2.7
env: TOXENV=py27-django19
- python: 2.7
env: TOXENV=py27-django18

branches:
only:
Expand Down
3 changes: 2 additions & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ Compatibility with DRF, Django and Python

=============== ============================ ==================== ==================================
DRF-gis version DRF version Django version Python version
**0.11.x** **3.1** to **3.6** **1.7** to **1.11** **2.7** to **3.6**
**0.12.x** **3.1** to **3.7** **1.9** to **1.11** **2.7** to **3.6**
**0.11.x** **3.1** to **3.7** **1.7** to **1.11** **2.7** to **3.6**
**0.10.x** **3.1** to **3.3** **1.7** to **1.9** **2.7** to **3.5**
**0.9.6** **3.1** to **3.2** **1.5** to **1.8** **2.6** to **3.5**
**0.9.5** **3.1** to **3.2** **1.5** to **1.8** **2.6** to **3.4**
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
six
djangorestframework>=3.3,<3.7
djangorestframework>=3.3,<3.8
2 changes: 1 addition & 1 deletion tests/django_restframework_gis_tests/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework import generics
from rest_framework.filters import DjangoFilterBackend
from rest_framework_gis.filters import *
from rest_framework_gis.pagination import GeoJsonPagination

Expand Down
3 changes: 1 addition & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{27,34,35,36,py,py3}-django{18,19,110,111}{,-pytest}
envlist = py{27,34,35,36,py,py3}-django{19,110,111}{,-pytest}

[testenv]
usedevelop = true
Expand All @@ -13,7 +13,6 @@ commands =
{env:DRFG_TEST_RUNNER} {posargs:tests/django_restframework_gis_tests}

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
Expand Down