jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-27 02:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix version handling with nightly (#1273)

Browse Source 
* Fix version handling with nightly

* fix lint
This commit is contained in:
Pascal Vizeli 2019-09-02 14:37:59 +02:00 committed by GitHub
parent 3d665b9eec
commit 272d8b29f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hassio/addons/model.py
View File

@ -1,8 +1,8 @@
"""Init file for Hass.io add-ons.""" """Init file for Hass.io add-ons."""
from distutils.version import StrictVersion
from pathlib import Path from pathlib import Path
from typing import Any, Awaitable, Dict, List, Optional from typing import Any, Awaitable, Dict, List, Optional
from packaging import version as pkg_version
import voluptuous as vol import voluptuous as vol
from ..const import ( from ..const import (
@ -482,7 +482,9 @@ class AddonModel(CoreSysAttributes):
# Home Assistant # Home Assistant
version = config.get(ATTR_HOMEASSISTANT) or self.sys_homeassistant.version version = config.get(ATTR_HOMEASSISTANT) or self.sys_homeassistant.version
if StrictVersion(self.sys_homeassistant.version) < StrictVersion(version): if pkg_version.parse(self.sys_homeassistant.version) < pkg_version.parse(
version
):
return False return False
return True return True

6
hassio/homeassistant.py
View File

@ -2,7 +2,6 @@
import asyncio import asyncio
from contextlib import asynccontextmanager, suppress from contextlib import asynccontextmanager, suppress
from datetime import datetime, timedelta from datetime import datetime, timedelta
from distutils.version import StrictVersion
from ipaddress import IPv4Address from ipaddress import IPv4Address
import logging import logging
import os import os
@ -16,6 +15,7 @@ from uuid import UUID
import aiohttp import aiohttp
from aiohttp import hdrs from aiohttp import hdrs
import attr import attr
from packaging import version as pkg_version
from .const import ( from .const import (
ATTR_ACCESS_TOKEN, ATTR_ACCESS_TOKEN,
@ -80,7 +80,9 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
try: try:
# Evaluate Version if we lost this information # Evaluate Version if we lost this information
if not self.version: if not self.version:
self.version = await self.instance.get_latest_version(key=StrictVersion) self.version = await self.instance.get_latest_version(
key=pkg_version.parse
)
await self.instance.attach(tag=self.version) await self.instance.attach(tag=self.version)
except DockerAPIError: except DockerAPIError:

1
requirements.txt
View File

@ -7,6 +7,7 @@ cpe==1.2.1
cryptography==2.7 cryptography==2.7
docker==4.0.2 docker==4.0.2
gitpython==3.0.2 gitpython==3.0.2
packaging==19.1
pytz==2019.2 pytz==2019.2
pyudev==0.21.0 pyudev==0.21.0
uvloop==0.12.2 uvloop==0.12.2