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

import __version__ instead of open file __init__

Browse source
This commit is contained in:
Cayo Puigdefabregas 2020-09-22 11:57:39 +02:00
parent 6c45754710
commit fed6b57bbe
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ereuse_devicehub/resources/versions/versions.py
View file

@ -1,4 +1,3 @@
import re
import flask import flask
import json import json
import requests import requests
@ -10,6 +9,7 @@ from flask import make_response, g
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
from ereuse_devicehub import __version__
def get_tag_version(app): def get_tag_version(app):
@ -31,10 +31,9 @@ def get_tag_version(app):
class VersionView(View): class VersionView(View):
def get(self, *args, **kwargs): def get(self, *args, **kwargs):
"""Get version of DeviceHub and ereuse-tag.""" """Get version of DeviceHub and ereuse-tag."""
with open("ereuse_devicehub/__init__.py", encoding="utf8") as f:
dh_version = re.search(r'__version__ = "(.*?)"', f.read()).group(1)
tag_version = get_tag_version(self.resource_def.app) tag_version = get_tag_version(self.resource_def.app)
versions = {'devicehub': dh_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) return json.dumps(versions)
@ -58,7 +57,7 @@ class VersionDef(Resource):
super().__init__(app, import_name, static_folder, static_url_path, template_folder, super().__init__(app, import_name, static_folder, static_url_path, template_folder,
url_prefix, subdomain, url_defaults, root_path, cli_commands) url_prefix, subdomain, url_defaults, root_path, cli_commands)
d = {'devicehub': '0.0.0'} d = {'devicehub': __version__, "ereuse_tag": "0.0.0"}
get = {'GET'} get = {'GET'}
version_view = VersionView.as_view('VersionView', definition=self) version_view = VersionView.as_view('VersionView', definition=self)

7
setup.py
View file

@ -1,10 +1,7 @@
import re
from pathlib import Path from pathlib import Path
from setuptools import find_packages, setup from setuptools import find_packages, setup
from ereuse_devicehub import __version__
with open("ereuse_devicehub/__init__.py", encoding="utf8") as f:
version = re.search(r'__version__ = "(.*?)"', f.read()).group(1)
test_requires = [ test_requires = [
'pytest', 'pytest',
@ -13,7 +10,7 @@ test_requires = [
setup( setup(
name='ereuse-devicehub', name='ereuse-devicehub',
version=version, version=__version__,
url='https://github.com/ereuse/devicehub-teal', url='https://github.com/ereuse/devicehub-teal',
project_urls={ project_urls={
'Documentation': 'http://devicehub.ereuse.org', 'Documentation': 'http://devicehub.ereuse.org',

7
tests/test_endpoints.py
View file

@ -1,5 +1,4 @@
import datetime import datetime
import re
import pytest import pytest
from uuid import UUID from uuid import UUID
@ -13,6 +12,7 @@ from sqlalchemy.util import OrderedSet
from teal.db import ResourceNotFound from teal.db import ResourceNotFound
from teal.enums import Layouts from teal.enums import Layouts
from ereuse_devicehub import __version__
from ereuse_devicehub.client import Client, UserClient from ereuse_devicehub.client import Client, UserClient
from ereuse_devicehub.db import db from ereuse_devicehub.db import db
from ereuse_devicehub.devicehub import Devicehub from ereuse_devicehub.devicehub import Devicehub
@ -123,9 +123,8 @@ def test_get_version(app: Devicehub, client: Client):
"""Checks GETting versions of services.""" """Checks GETting versions of services."""
content, res = client.get("/versions/", None) content, res = client.get("/versions/", None)
with open("ereuse_devicehub/__init__.py", encoding="utf8") as f:
dh_version = re.search(r'__version__ = "(.*?)"', f.read()).group(1) version = {'devicehub': __version__, 'ereuse_tag': '0.0.0'}
version = {'devicehub': dh_version, 'ereuse_tag': '0.0.0'}
assert res.status_code == 200 assert res.status_code == 200
assert content == version assert content == version