Merge branch 'pr818'

tfranzel · Sep 22, 2022 · 0147d32 · 0147d32
2 parents 536fac2 + 6973aa4
commit 0147d32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/drf_spectacular/openapi.py b/drf_spectacular/openapi.py
@@ -811,7 +811,13 @@ def _map_serializer_field(self, field, direction, bypass_extensions=False):
 
             return append_meta(self._map_response_type_hint(method), meta)
 
-        if isinstance(field, (serializers.BooleanField, serializers.NullBooleanField)):
+        # NullBooleanField was removed in 3.14. Since 3.12.0 NullBooleanField was a subclass of BooleanField
+        if hasattr(serializers, "NullBooleanField"):
+            boolean_field_classes = (serializers.BooleanField, serializers.NullBooleanField)
+        else:
+            boolean_field_classes = (serializers.BooleanField,)
+
+        if isinstance(field, boolean_field_classes):
             return append_meta(build_basic_type(OpenApiTypes.BOOL), meta)
 
         if isinstance(field, serializers.JSONField):

diff --git a/tox.ini b/tox.ini
@@ -3,9 +3,9 @@ envlist =
        py39-lint,py39-docs,
        {py36,py37,py38}-django{2.2}-drf{3.10,3.11},
        {py37,py38,py39}-django{3.2}-drf{3.11,3.12},
-       {py38,py39,py310}-django{4.0,4.1}-drf{3.13},
+       {py38,py39,py310}-django{4.0,4.1}-drf{3.13,3.14},
        py310-django4.1-drfmaster
-       py310-djangomaster-drf3.13
+       py310-djangomaster-drf3.14
        py310-drfmaster-djangomaster
        py310-drfmaster-djangomaster-allowcontribfail
 skip_missing_interpreters = true
@@ -26,6 +26,7 @@ deps =
        drf3.11: djangorestframework>=3.11,<3.12
        drf3.12: djangorestframework>=3.12,<3.13
        drf3.13: djangorestframework>=3.13,<3.14
+       drf3.14: djangorestframework>=3.14,<3.15
 
        djangomaster: https://github.com/django/django/archive/main.tar.gz
        drfmaster: https://github.com/encode/django-rest-framework/archive/master.tar.gz