Merge branch 'testing' into feature/61-Json-Backup
This commit is contained in:
commit
a702f2f9b3
|
@ -6,6 +6,7 @@ import teal.marshmallow
|
|||
from typing import Callable, Iterable, Tuple
|
||||
from urllib.parse import urlparse
|
||||
from flask import make_response, g
|
||||
from flask.json import jsonify
|
||||
from teal.resource import Resource, View
|
||||
|
||||
from ereuse_devicehub.resources.inventory.model import Inventory
|
||||
|
@ -35,7 +36,10 @@ class VersionView(View):
|
|||
tag_version = get_tag_version(self.resource_def.app)
|
||||
versions = {'devicehub': __version__, "ereuse_tag": "0.0.0"}
|
||||
versions.update(tag_version)
|
||||
return json.dumps(versions)
|
||||
|
||||
ret = jsonify(versions)
|
||||
ret.status_code = 200
|
||||
return ret
|
||||
|
||||
|
||||
class VersionDef(Resource):
|
||||
|
|
Reference in New Issue