Merge pull request #795 from axnsan12/1.20.x

Advance master up to release 1.20.3
axnsan12 · Jul 15, 2022 · 6557517 · 6557517
2 parents d9700db + 18bd6c5
commit 6557517
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     tags: 
-      - "v*.*.*"
+      - "*.*.*"
 
 jobs:
   publish:

diff --git a/requirements/publish.txt b/requirements/publish.txt
@@ -1 +1,2 @@
-wheel>=0.37.0
+setuptools-scm==7.0.5
+wheel>=0.37.0
diff --git a/src/drf_yasg/inspectors/field.py b/src/drf_yasg/inspectors/field.py
@@ -380,7 +380,7 @@ def decimal_field_type(field):
     (models.DateTimeField, (openapi.TYPE_STRING, openapi.FORMAT_DATETIME)),
     (models.DateField, (openapi.TYPE_STRING, openapi.FORMAT_DATE)),
     (models.DecimalField, (decimal_field_type, openapi.FORMAT_DECIMAL)),
-    (models.DurationField, (openapi.TYPE_INTEGER, None)),
+    (models.DurationField, (openapi.TYPE_STRING, None)),
     (models.FloatField, (openapi.TYPE_NUMBER, None)),
     (models.IntegerField, (openapi.TYPE_INTEGER, None)),
     (models.IPAddressField, (openapi.TYPE_STRING, openapi.FORMAT_IPV4)),
@@ -407,7 +407,7 @@ def decimal_field_type(field):
     (serializers.IntegerField, (openapi.TYPE_INTEGER, None)),
     (serializers.FloatField, (openapi.TYPE_NUMBER, None)),
     (serializers.DecimalField, (decimal_field_type, openapi.FORMAT_DECIMAL)),
-    (serializers.DurationField, (openapi.TYPE_NUMBER, None)),  # ?
+    (serializers.DurationField, (openapi.TYPE_STRING, None)),
     (serializers.DateField, (openapi.TYPE_STRING, openapi.FORMAT_DATE)),
     (serializers.DateTimeField, (openapi.TYPE_STRING, openapi.FORMAT_DATETIME)),
     (serializers.ModelField, (openapi.TYPE_STRING, None)),