trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' into feature/61-Json-Backup

This commit is contained in:
Cayo Puigdefabregas 2020-10-14 11:41:02 +02:00
parent 150c73779d 833bf12719
commit a702f2f9b3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ereuse_devicehub/resources/versions/versions.py
View File

@ -6,6 +6,7 @@ import teal.marshmallow
from typing import Callable, Iterable, Tuple from typing import Callable, Iterable, Tuple
from urllib.parse import urlparse from urllib.parse import urlparse
from flask import make_response, g from flask import make_response, g
from flask.json import jsonify
from teal.resource import Resource, View from teal.resource import Resource, View
from ereuse_devicehub.resources.inventory.model import Inventory from ereuse_devicehub.resources.inventory.model import Inventory
@ -35,7 +36,10 @@ class VersionView(View):
tag_version = get_tag_version(self.resource_def.app) tag_version = get_tag_version(self.resource_def.app)
versions = {'devicehub': __version__, "ereuse_tag": "0.0.0"} versions = {'devicehub': __version__, "ereuse_tag": "0.0.0"}
versions.update(tag_version) versions.update(tag_version)
return json.dumps(versions)
ret = jsonify(versions)
ret.status_code = 200
return ret
class VersionDef(Resource): class VersionDef(Resource):