Use octoprint.__version__ instead of more convuluted option
This commit is contained in:
parent
c7e248b142
commit
f1518e6fe6
1 changed files with 10 additions and 13 deletions
|
|
@ -9,30 +9,27 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp
|
|||
import pkg_resources
|
||||
import logging
|
||||
|
||||
from octoprint._version import get_versions
|
||||
|
||||
|
||||
_VERSION = get_versions()["version"]
|
||||
from octoprint import __version__
|
||||
|
||||
|
||||
def get_octoprint_version_string():
|
||||
return _VERSION
|
||||
return __version__
|
||||
|
||||
|
||||
def get_octoprint_version(base=False):
|
||||
octoprint_version_string = get_octoprint_version_string()
|
||||
|
||||
|
||||
if "-" in octoprint_version_string:
|
||||
octoprint_version_string = octoprint_version_string[:octoprint_version_string.find("-")]
|
||||
|
||||
|
||||
octoprint_version = pkg_resources.parse_version(octoprint_version_string)
|
||||
|
||||
|
||||
# A leading v is common in github release tags and old setuptools doesn't remove it. While OctoPrint's
|
||||
# versions should never contain such a prefix, we'll make sure to have stuff behave the same
|
||||
# regardless of setuptools version anyhow.
|
||||
if octoprint_version and isinstance(octoprint_version, tuple) and octoprint_version[0].lower() == "*v":
|
||||
octoprint_version = octoprint_version[1:]
|
||||
|
||||
|
||||
if base:
|
||||
if isinstance(octoprint_version, tuple):
|
||||
# old setuptools
|
||||
|
|
@ -52,22 +49,22 @@ def get_octoprint_version(base=False):
|
|||
def is_octoprint_compatible(*compatibility_entries, **kwargs):
|
||||
"""
|
||||
Tests if the current ``octoprint_version`` is compatible to any of the provided ``compatibility_entries``.
|
||||
|
||||
|
||||
Arguments:
|
||||
compatibility_entries (str): compatibility string(s) to test against, result will be `True` if any match
|
||||
is found
|
||||
octoprint_version (tuple or SetuptoolsVersion): optional OctoPrint version to match against, if not current
|
||||
base version will be determined via :func:`get_octoprint_version`.
|
||||
|
||||
|
||||
Returns:
|
||||
(bool) ``True`` if any of the provided compatibility entries matches or there are no entries, else ``False``
|
||||
"""
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
if not compatibility_entries:
|
||||
return True
|
||||
|
||||
|
||||
octoprint_version = kwargs.get("octoprint_version")
|
||||
if octoprint_version is None:
|
||||
octoprint_version = get_octoprint_version(base=True)
|
||||
|
|
|
|||
Loading…
Reference in a new issue