Skip to content

Commit

Permalink
Merge pull request #795 from axnsan12/1.20.x
Browse files Browse the repository at this point in the history
Advance master up to release 1.20.3
  • Loading branch information
JoelLefkowitz authored Jul 15, 2022
2 parents d9700db + 18bd6c5 commit 6557517
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish
on:
push:
tags:
- "v*.*.*"
- "*.*.*"

jobs:
publish:
Expand Down
3 changes: 2 additions & 1 deletion requirements/publish.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
wheel>=0.37.0
setuptools-scm==7.0.5
wheel>=0.37.0
4 changes: 2 additions & 2 deletions src/drf_yasg/inspectors/field.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand All @@ -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)),
Expand Down

0 comments on commit 6557517

Please sign in to comment.