From 1974618e29229df64fdf61918a5d7da141d95c2c Mon Sep 17 00:00:00 2001 From: Paris Kolios Date: Wed, 18 Oct 2017 10:53:46 +0200 Subject: [PATCH 1/3] Allow compatibility with DRF 3.7 --- README.rst | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index aa97d8d4..d6f2fcca 100644 --- a/README.rst +++ b/README.rst @@ -39,7 +39,7 @@ 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.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** diff --git a/requirements.txt b/requirements.txt index ba1aac69..d04748e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ six -djangorestframework>=3.3,<3.7 +djangorestframework>=3.3,<3.8 From 39c9781d7b64cddfb4f88781e3e2365ced0b6932 Mon Sep 17 00:00:00 2001 From: Paris Kolios Date: Wed, 18 Oct 2017 12:04:53 +0200 Subject: [PATCH 2/3] Fix tests views DjangoFilterBackend import --- tests/django_restframework_gis_tests/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/django_restframework_gis_tests/views.py b/tests/django_restframework_gis_tests/views.py index 4f1e0126..7333b7d5 100644 --- a/tests/django_restframework_gis_tests/views.py +++ b/tests/django_restframework_gis_tests/views.py @@ -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 From 9e574967dc64a73aa2dfb647c8adaae40cb36826 Mon Sep 17 00:00:00 2001 From: Paris Kolios Date: Wed, 18 Oct 2017 15:12:10 +0200 Subject: [PATCH 3/3] Drop support for Django 1.8 --- .travis.yml | 4 ---- README.rst | 1 + tox.ini | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 713f1809..48843ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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: diff --git a/README.rst b/README.rst index d6f2fcca..67e695a0 100644 --- a/README.rst +++ b/README.rst @@ -39,6 +39,7 @@ Compatibility with DRF, Django and Python =============== ============================ ==================== ================================== DRF-gis version DRF version Django version Python version +**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** diff --git a/tox.ini b/tox.ini index 0c284adc..653e2d5f 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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