From 6b4bdc39960ba9f6de5182e53df7b16387947e5f Mon Sep 17 00:00:00 2001 From: Emanuel Winblad Date: Sat, 6 Nov 2021 22:09:46 +0100 Subject: [PATCH] Downgrade semver to version 2 To avoid conflict with other version of the package used by home-assistant/core. --- Pipfile | 2 +- Pipfile.lock | 8 ++++---- requirements.txt | 2 +- vilfo/client.py | 6 ++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Pipfile b/Pipfile index 1c0f12c..f7199c7 100644 --- a/Pipfile +++ b/Pipfile @@ -6,7 +6,7 @@ name = "pypi" [packages] requests = "*" getmac = "~=0.8" -semver = "*" +semver = "~=2.0" [dev-packages] black = "*" diff --git a/Pipfile.lock b/Pipfile.lock index bb1b8b8..ca397d1 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1c31aa31bfe24ef719a4a72cace3773661862d56948ae6d741cc276724c5afe5" + "sha256": "67c2dcf48b4a0397d235a4986024838f373c2d9eba182b963287910f9138b09f" }, "pipfile-spec": 6, "requires": { @@ -57,11 +57,11 @@ }, "semver": { "hashes": [ - "sha256:153511dda7e85ce68673607bc7565e252b6495b23a5f631d73c59138b7aea5db", - "sha256:55dd56b0144d7fa48708300076d861655769bcfc4334b22cbb08486bf976eb6c" + "sha256:ced8b23dceb22134307c1b8abfa523da14198793d9787ac838e70e29e77458d4", + "sha256:fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f" ], "index": "pypi", - "version": "==3.0.0.dev2" + "version": "==2.13.0" }, "urllib3": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index 5fe1105..2d5836a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,5 +11,5 @@ charset-normalizer==2.0.7; python_version >= '3' getmac==0.8.2 idna==3.3; python_version >= '3' requests==2.26.0 -semver==3.0.0.dev2 +semver==2.13.0 urllib3==1.26.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' diff --git a/vilfo/client.py b/vilfo/client.py index e77cdff..55a5704 100644 --- a/vilfo/client.py +++ b/vilfo/client.py @@ -4,7 +4,7 @@ import ipaddress import json import requests -from semver.version import Version as SemverVersion +from semver import compare as semver_compare import vilfo.exceptions @@ -39,9 +39,7 @@ def __init__(self, host, token, ssl=False): except vilfo.exceptions.VilfoException: pass - self._api_v1_supported = SemverVersion.parse(self._firmware_version) >= "1.1.0" - - print(self._api_v1_supported) + self._api_v1_supported = semver_compare(self._firmware_version, "1.1.0") >= 0 def _request(self, method, endpoint, headers=None, data=None, params=None, timeout=None): """Internal method to facilitate performing requests with authentication added to them