[deps] Add support for django 3.2 and 4.0 #263

devkapilbansal · web-flow · commit 4b9882339d61 · 2021-12-09T12:40:44.000-03:00
* [fix] Fix docker-compose not working * [deps] Added python 3.6 back to support * [docs] Updated compatibility table and updated dependency monitoring Closes #263
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,6 +61,16 @@ jobs:
             TOXENV: py38-django31-djangorestframework312
           - python: 3.9
             TOXENV: py39-django31-djangorestframework312
+          - python: 3.7
+            TOXENV: py37-django32-djangorestframework312
+          - python: 3.8
+            TOXENV: py38-django32-djangorestframework312
+          - python: 3.9
+            TOXENV: py39-django32-djangorestframework312
+          - python: 3.8
+            TOXENV: py38-django40-djangorestframework_master
+          - python: 3.9
+            TOXENV: py39-django40-djangorestframework_master
     steps:
       - uses: actions/checkout@v2
         with:
@@ -78,7 +88,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install -U "pip==20.2.4" wheel setuptools
+          pip install -U pip wheel setuptools
           pip install -U -r requirements-test.txt
           pip install tox docutils pygments
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.8
+FROM python:3.7-alpine
 
 # postgresql-client is required by psql
 # postgresql-dev musl-dev gcc are required by psycopg
diff --git a/README.rst b/README.rst
@@ -37,35 +37,36 @@ Add ``rest_framework_gis`` in ``settings.INSTALLED_APPS``, after ``rest_framewor
 Compatibility with DRF, Django and Python
 -----------------------------------------
 
-===============  ============================ ==================== ==================================
-DRF-gis version  DRF version                  Django version       Python version
-**0.17.x**       **3.10** up to **3.12**      **2.2 to 3.1**       **3.6** to **3.8**
-**0.16.x**       **3.10**                     **2.2 to 3.1**       **3.6** to **3.8**
-**0.15.x**       **3.10**                     **1.11, 2.2 to 3.0** **3.5** to **3.8**
-**0.14.x**       **3.3** to **3.9**           **1.11** to **2.1**   **3.4** to **3.7**
-**0.13.x**       **3.3** to **3.8**           **1.11** to **2.0**   **2.7** to **3.6**
-**0.12.x**       **3.1** to **3.7**           **1.11** to **2.0**   **2.7** to **3.6**
-**0.11.x**       **3.1** to **3.6**           **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**
-**0.9.4**        **3.1** to **3.2**           **1.5** to **1.8**   **2.6** to **3.4**
-**0.9.3**        **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
-**0.9.2**        **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
-**0.9.1**        **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
-**0.9**          **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.9**          **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.9**          **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.8.2**        **3.0.4** to **3.1.1**       **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.8.1**        **3.0.4** to **3.1.1**       **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.8**          **3.0.4**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.7**          **2.4.3**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.6**          **2.4.3**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.5**          from **2.3.14** to **2.4.2** **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.4**          from **2.3.14** to **2.4.2** **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
-**0.3**          from **2.3.14** to **2.4.2** **1.5**, **1.6**     **2.6**, **2.7**
-**0.2**          from **2.2.2** to **2.3.13** **1.5**, **1.6**     **2.6**, **2.7**
-===============  ============================ ==================== ==================================
+========================  ============================ ==================== ==================================
+DRF-gis version           DRF version                  Django version       Python version
+**0.18.x (unreleased)**   **3.10** up to **3.12**      **2.2 to 4.0**       **3.6** to **3.9**
+**0.17.x**                **3.10** up to **3.12**      **2.2 to 3.1**       **3.6** to **3.8**
+**0.16.x**                **3.10**                     **2.2 to 3.1**       **3.6** to **3.8**
+**0.15.x**                **3.10**                     **1.11, 2.2 to 3.0** **3.5** to **3.8**
+**0.14.x**                **3.3** to **3.9**           **1.11** to **2.1**   **3.4** to **3.7**
+**0.13.x**                **3.3** to **3.8**           **1.11** to **2.0**   **2.7** to **3.6**
+**0.12.x**                **3.1** to **3.7**           **1.11** to **2.0**   **2.7** to **3.6**
+**0.11.x**                **3.1** to **3.6**           **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**
+**0.9.4**                 **3.1** to **3.2**           **1.5** to **1.8**   **2.6** to **3.4**
+**0.9.3**                 **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
+**0.9.2**                 **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
+**0.9.1**                 **3.1**                      **1.5** to **1.8**   **2.6** to **3.4**
+**0.9**                   **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.9**                   **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.9**                   **3.1**                      **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.8.2**                 **3.0.4** to **3.1.1**       **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.8.1**                 **3.0.4** to **3.1.1**       **1.5** to **1.8**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.8**                   **3.0.4**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.7**                   **2.4.3**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.6**                   **2.4.3**                    **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.5**                   from **2.3.14** to **2.4.2** **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.4**                   from **2.3.14** to **2.4.2** **1.5** to **1.7**   **2.6**, **2.7**, **3.3**, **3.4**
+**0.3**                   from **2.3.14** to **2.4.2** **1.5**, **1.6**     **2.6**, **2.7**
+**0.2**                   from **2.2.2** to **2.3.13** **1.5**, **1.6**     **2.6**, **2.7**
+========================  ============================ ==================== ==================================
 
 Fields
 ------
@@ -754,8 +755,9 @@ Contributing
    :target: https://github.com/openwisp/django-rest-framework-gis/actions?query=workflow%3A%22Django+Rest+Framework+Gis+CI+Build%22
 .. |Coverage Status| image:: https://coveralls.io/repos/openwisp/django-rest-framework-gis/badge.svg
    :target: https://coveralls.io/r/openwisp/django-rest-framework-gis
-.. |Requirements Status| image:: https://requires.io/github/openwisp/django-rest-framework-gis/requirements.svg?branch=master
-   :target: https://requires.io/github/openwisp/django-rest-framework-gis/requirements/?branch=master
+.. |Requirements Status| image:: https://img.shields.io/librariesio/release/github/openwisp/django-rest-framework-gis
+   :target: https://libraries.io/github/openwisp/django-rest-framework-gis#repository_dependencies
+   :alt: Dependency monitoring
 .. |PyPI version| image:: https://badge.fury.io/py/djangorestframework-gis.svg
    :target: http://badge.fury.io/py/djangorestframework-gis
 .. |PyPI downloads| image:: https://pepy.tech/badge/djangorestframework-gis/month
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,12 @@ services:
 
     postgres:
         image: mdillon/postgis:10-alpine
+        environment:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_DB: django_restframework_gis
+        ports: 
+          - 5432:5432
         volumes:
             - postgres_data:/var/lib/postgresql/data
 
diff --git a/rest_framework_gis/fields.py b/rest_framework_gis/fields.py
@@ -4,7 +4,7 @@
 from django.contrib.gis.gdal import GDALException
 from django.contrib.gis.geos import GEOSException, GEOSGeometry
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework.fields import Field, SerializerMethodField
 
 __all__ = ['GeometryField', 'GeometrySerializerMethodField']
diff --git a/tests/django_restframework_gis_tests/urls.py b/tests/django_restframework_gis_tests/urls.py
@@ -1,108 +1,108 @@
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.location_list, name='api_location_list'),
-    url(r'^(?P<pk>[0-9]+)/$', views.location_details, name='api_location_details'),
+    path('', views.location_list, name='api_location_list'),
+    path('<int:pk>', views.location_details, name='api_location_details'),
     # geojson
-    url(r'^geojson/$', views.geojson_location_list, name='api_geojson_location_list'),
-    url(
-        r'^geojson/(?P<pk>[0-9]+)/$',
+    path('geojson/', views.geojson_location_list, name='api_geojson_location_list'),
+    path(
+        'geojson/<int:pk>/',
         views.geojson_location_details,
         name='api_geojson_location_details',
     ),
-    url(
-        r'^geojson-nullable/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson-nullable/<int:pk>/',
         views.geojson_nullable_details,
         name='api_geojson_nullable_details',
     ),
-    url(
-        r'^geojson_hidden/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson_hidden/<int:pk>/',
         views.geojson_location_details_hidden,
         name='api_geojson_location_details_hidden',
     ),
-    url(
-        r'^geojson_none/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson_none/<int:pk>/',
         views.geojson_location_details_none,
         name='api_geojson_location_details_none',
     ),
-    url(
-        r'^geojson/(?P<slug>[-\w]+)/$',
+    path(
+        'geojson/<slug:slug>/',
         views.geojson_location_slug_details,
         name='api_geojson_location_slug_details',
     ),
-    url(
-        r'^geojson-falseid/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson-falseid/<int:pk>/',
         views.geojson_location_falseid_details,
         name='api_geojson_location_falseid_details',
     ),
-    url(
-        r'^geojson-noid/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson-noid/<int:pk>/',
         views.geojson_location_noid_details,
         name='api_geojson_location_noid_details',
     ),
     # file
-    url(
-        r'^geojson-file/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson-file/<int:pk>/',
         views.geojson_located_file_details,
         name='api_geojson_located_file_details',
     ),
     # geojson with bbox with its own geometry field
-    url(
-        r'^geojson-with-bbox/$',
+    path(
+        'geojson-with-bbox/',
         views.geojson_boxedlocation_list,
         name='api_geojson_boxedlocation_list',
     ),
-    url(
-        r'^geojson-with-bbox/(?P<pk>[0-9]+)/$',
+    path(
+        'geojson-with-bbox/<int:pk>/',
         views.geojson_boxedlocation_details,
         name='api_geojson_boxedlocation_details',
     ),
     # geojson with bbox with autogenerated bbox
-    url(
-        r'^geojson-with-auto-bbox/$',
+    path(
+        'geojson-with-auto-bbox/',
         views.geojson_location_bbox_list,
         name='api_geojson_location_bbox_list',
     ),
     # Filters
-    url(
-        r'^filters/contained_in_bbox$',
+    path(
+        'filters/contained_in_bbox',
         views.geojson_location_contained_in_bbox_list,
         name='api_geojson_location_list_contained_in_bbox_filter',
     ),
-    url(
-        r'^filters/overlaps_bbox$',
+    path(
+        'filters/overlaps_bbox',
         views.geojson_location_overlaps_bbox_list,
         name='api_geojson_location_list_overlaps_bbox_filter',
     ),
-    url(
-        r'^filters/contained_in_geometry$',
+    path(
+        'filters/contained_in_geometry',
         views.geojson_contained_in_geometry,
         name='api_geojson_contained_in_geometry',
     ),
-    url(
-        r'^filters/contained_in_tile$',
+    path(
+        'filters/contained_in_tile',
         views.geojson_location_contained_in_tile_list,
         name='api_geojson_location_list_contained_in_tile_filter',
     ),
-    url(
-        r'^filters/overlaps_tile$',
+    path(
+        'filters/overlaps_tile',
         views.geojson_location_overlaps_tile_list,
         name='api_geojson_location_list_overlaps_tile_filter',
     ),
-    url(
-        r'^filters/within_distance_of_point$',
+    path(
+        'filters/within_distance_of_point',
         views.geojson_location_within_distance_of_point_list,
         name='api_geojson_location_list_within_distance_of_point_filter',
     ),
-    url(
-        r'^filters/within_degrees_of_point$',
+    path(
+        'filters/within_degrees_of_point',
         views.geojson_location_within_degrees_of_point_list,
         name='api_geojson_location_list_within_degrees_of_point_filter',
     ),
-    url(
-        r'^filters/order_distance_to_point$',
+    path(
+        'filters/order_distance_to_point',
         views.geojson_location_order_distance_to_point_list,
         name='api_geojson_location_order_distance_to_point_list_filter',
     ),
diff --git a/tests/settings.py b/tests/settings.py
@@ -16,6 +16,8 @@
     },
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 SECRET_KEY = 'fn)t*+$)ugeyip6-#txyy$5wf2ervc0d2n#h)qb)y5@ly$t*@w'
 
 INSTALLED_APPS = (
@@ -25,6 +27,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
+    'django.contrib.gis',
     # rest framework
     'rest_framework',
     'rest_framework_gis',
diff --git a/tests/urls.py b/tests/urls.py
@@ -1,15 +1,12 @@
-try:
-    from django.urls import include, url
-except ImportError:
-    from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.staticfiles import views
+from django.urls import include, path
 
 urlpatterns = [
     # Uncomment the next line to enable the admin:
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
     # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'', include('django_restframework_gis_tests.urls')),
-    url(r'^static/(?P<path>.*)$', views.serve),
+    # url('admin/doc/', include('django.contrib.admindocs.urls')),
+    path('', include('django_restframework_gis_tests.urls')),
+    path('static/<path>', views.serve),
 ]
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
 envlist =
-    py{36,37,38,39,py3}-django{22}-djangorestframework{310,312}{,-pytest}
-    py{36,37,38,39,py3}-django{30,31}-djangorestframework{312}{,-pytest}
+    py{37,38,39,py3}-django{22}-djangorestframework{310,312}{,-pytest}
+    py{37,38,39,py3}-django{30,31,32}-djangorestframework{312}{,-pytest}
+    py{38,39,py3}-django{40}-djangorestframework_master{,-pytest}
 
 [testenv]
 usedevelop = true
@@ -20,8 +21,11 @@ deps =
     django22: Django~=2.2.0
     django30: Django~=3.0.0
     django31: Django~=3.1.0
+    django32: Django~=3.2.0
+    django40: Django~=4.0.0
     djangorestframework310: djangorestframework~=3.10.0
     djangorestframework312: djangorestframework~=3.12.0
+    djangorestframework_master: djangorestframework @ https://github.com/encode/django-rest-framework/tarball/master
     -rrequirements-test.txt
     pytest: pytest
     pytest: pytest-django

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.7-alpine3.8`
	`1`	`+FROM python:3.7-alpine`
`2`	`2`
`3`	`3`	`# postgresql-client is required by psql`
`4`	`4`	`# postgresql-dev musl-dev gcc are required by psycopg`