Merge branch 'master' into prepDjango41

openwisp · Jan 9, 2022 · 9ef97c0 · 9ef97c0
2 parents ecbc2b0 + 88d3d24
commit 9ef97c0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
           POSTGRES_DB: django_restframework_gis
-        ports: 
+        ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
@@ -68,9 +68,9 @@ jobs:
           - python: 3.9
             TOXENV: py39-django32-djangorestframework312
           - python: 3.8
-            TOXENV: py38-django40-djangorestframework_master
+            TOXENV: py38-django40-djangorestframework313
           - python: 3.9
-            TOXENV: py39-django40-djangorestframework_master
+            TOXENV: py39-django40-djangorestframework313
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 0.18.0 [2022-01-07]
+---------------------------
+
+- [fix] Add schema generation support for plain GeometryFields `#257
+  <https://github.com/openwisp/django-rest-framework-gis/issues/#257>`_
+- [fix] Fixed psycopg2 compatibility for Django 3.0
+- [feature] Added support and CI testing for Django 3.2 and Django 4.0
+
 Version 0.17.0 [2021-01-25]
 ---------------------------
 

diff --git 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.18.x (unreleased)**   **3.10** up to **3.12**      **2.2 to 4.0**       **3.6** to **3.9**
+**0.18.x**                **3.10** up to **3.13**      **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**

diff --git a/rest_framework_gis/__init__.py b/rest_framework_gis/__init__.py
@@ -1,9 +1,8 @@
 import django
 
-VERSION = (0, 17, 0, 'final')
+VERSION = (0, 18, 0, 'final')
 __version__ = VERSION  # alias
 
-
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])
     if VERSION[2]:

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     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}
+    py{38,39,py3}-django{40}-djangorestframework{313}{,-pytest}
 
 [testenv]
 usedevelop = true
@@ -25,7 +25,7 @@ deps =
     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
+    djangorestframework313: djangorestframework~=3.13.0
     -rrequirements-test.txt
     pytest: pytest
     pytest: pytest-django