Skip to content

Commit f8d4178

Browse files
bluemnerbluemner
authored
Merge pull request #2 from bluemner/v0.0.3
Update version 0.0.3 adding support for decimal type
2 parents 41ea169 + 3797fd0 commit f8d4178

10 files changed

+23
-22
lines changed

‎docs/.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 69ab87c0bbabcc6d6313fd937c01a0f9
3+
config: e9d9d97242fb756e7351053bcebcda8f
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/_static/documentation_options.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '0.0.2',
3+
VERSION: '0.0.3rc1',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
FILE_SUFFIX: '.html',

‎docs/flask_restplus_sqlalchemy.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>flask_restplus_sqlalchemy package &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
11+
<title>flask_restplus_sqlalchemy package &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1212

1313

1414

@@ -33,7 +33,7 @@
3333
<link rel="index" title="Index"
3434
href="genindex.html"/>
3535
<link rel="search" title="Search" href="search.html"/>
36-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="index.html"/>
36+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="index.html"/>
3737

3838

3939
<script src="_static/js/modernizr.min.js"></script>
@@ -304,7 +304,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
304304
<script type="text/javascript">
305305
var DOCUMENTATION_OPTIONS = {
306306
URL_ROOT:'./',
307-
VERSION:'0.0.2',
307+
VERSION:'0.0.3rc1',
308308
COLLAPSE_INDEX:false,
309309
FILE_SUFFIX:'.html',
310310
HAS_SOURCE: true,

‎docs/genindex.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1111

12-
<title>Index &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
12+
<title>Index &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1313

1414

1515

@@ -34,7 +34,7 @@
3434
<link rel="index" title="Index"
3535
href="#"/>
3636
<link rel="search" title="Search" href="search.html"/>
37-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="index.html"/>
37+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="index.html"/>
3838

3939

4040
<script src="_static/js/modernizr.min.js"></script>
@@ -255,7 +255,7 @@ <h2 id="S">S</h2>
255255
<script type="text/javascript">
256256
var DOCUMENTATION_OPTIONS = {
257257
URL_ROOT:'./',
258-
VERSION:'0.0.2',
258+
VERSION:'0.0.3rc1',
259259
COLLAPSE_INDEX:false,
260260
FILE_SUFFIX:'.html',
261261
HAS_SOURCE: true,

‎docs/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>Flask RestPlus SQLAlchemy &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
11+
<title>Flask RestPlus SQLAlchemy &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1212

1313

1414

@@ -33,7 +33,7 @@
3333
<link rel="index" title="Index"
3434
href="genindex.html"/>
3535
<link rel="search" title="Search" href="search.html"/>
36-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="#"/>
36+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="#"/>
3737

3838

3939
<script src="_static/js/modernizr.min.js"></script>
@@ -304,7 +304,7 @@ <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe
304304
<script type="text/javascript">
305305
var DOCUMENTATION_OPTIONS = {
306306
URL_ROOT:'./',
307-
VERSION:'0.0.2',
307+
VERSION:'0.0.3rc1',
308308
COLLAPSE_INDEX:false,
309309
FILE_SUFFIX:'.html',
310310
HAS_SOURCE: true,

‎docs/modules.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>flask_restplus_sqlalchemy &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
11+
<title>flask_restplus_sqlalchemy &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1212

1313

1414

@@ -33,7 +33,7 @@
3333
<link rel="index" title="Index"
3434
href="genindex.html"/>
3535
<link rel="search" title="Search" href="search.html"/>
36-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="index.html"/>
36+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="index.html"/>
3737

3838

3939
<script src="_static/js/modernizr.min.js"></script>
@@ -191,7 +191,7 @@ <h1>flask_restplus_sqlalchemy<a class="headerlink" href="#flask-restplus-sqlalch
191191
<script type="text/javascript">
192192
var DOCUMENTATION_OPTIONS = {
193193
URL_ROOT:'./',
194-
VERSION:'0.0.2',
194+
VERSION:'0.0.3rc1',
195195
COLLAPSE_INDEX:false,
196196
FILE_SUFFIX:'.html',
197197
HAS_SOURCE: true,

‎docs/py-modindex.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>Python Module Index &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
11+
<title>Python Module Index &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1212

1313

1414

@@ -33,7 +33,7 @@
3333
<link rel="index" title="Index"
3434
href="genindex.html"/>
3535
<link rel="search" title="Search" href="search.html"/>
36-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="index.html"/>
36+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="index.html"/>
3737

3838

3939

@@ -199,7 +199,7 @@ <h1>Python Module Index</h1>
199199
<script type="text/javascript">
200200
var DOCUMENTATION_OPTIONS = {
201201
URL_ROOT:'./',
202-
VERSION:'0.0.2',
202+
VERSION:'0.0.3rc1',
203203
COLLAPSE_INDEX:false,
204204
FILE_SUFFIX:'.html',
205205
HAS_SOURCE: true,

‎docs/search.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>Search &mdash; flask_restplus_sqlalchemy 0.0.2 documentation</title>
11+
<title>Search &mdash; flask_restplus_sqlalchemy 0.0.3rc1 documentation</title>
1212

1313

1414

@@ -33,7 +33,7 @@
3333
<link rel="index" title="Index"
3434
href="genindex.html"/>
3535
<link rel="search" title="Search" href="#"/>
36-
<link rel="top" title="flask_restplus_sqlalchemy 0.0.2 documentation" href="index.html"/>
36+
<link rel="top" title="flask_restplus_sqlalchemy 0.0.3rc1 documentation" href="index.html"/>
3737

3838

3939
<script src="_static/js/modernizr.min.js"></script>
@@ -183,7 +183,7 @@
183183
<script type="text/javascript">
184184
var DOCUMENTATION_OPTIONS = {
185185
URL_ROOT:'./',
186-
VERSION:'0.0.2',
186+
VERSION:'0.0.3rc1',
187187
COLLAPSE_INDEX:false,
188188
FILE_SUFFIX:'.html',
189189
HAS_SOURCE: true,

‎flask_restplus_sqlalchemy/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
""" Factory for use with Flask SQL
22
"""
33
from .factory import ApiModelFactory
4-
__version__: str = '0.0.2'
4+
__version__: str = '0.0.3'

‎flask_restplus_sqlalchemy/factory.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Contains instace of factory for use by swagger
33
"""
44
import datetime
5+
import decimal
56
from logging import Logger, getLogger
67
from typing import List, Dict
78
from flask_sqlalchemy import SQLAlchemy
@@ -109,7 +110,7 @@ def python_to_flask(python_type: type) -> str:
109110
"""
110111
if python_type is int:
111112
return 'Integer'
112-
if python_type is float:
113+
if python_type in [float, decimal.Decimal]:
113114
return 'Float'
114115
if python_type is bool:
115116
return 'Boolean'

0 commit comments

Comments
 (0)