fix

Author: Jannis-Mittenzwei

exasol/toolbox/cli.py

@@ -1,6 +1,6 @@
 from argparse import ArgumentTypeError
 
-from exasol.toolbox.version import Version
+from exasol.toolbox.util.version import Version
 
 
 def version(arg: str) -> Version:

exasol/toolbox/nox/_package_version.py

@@ -11,7 +11,7 @@
 from nox import Session
 
 from exasol.toolbox.error import ToolboxError
-from exasol.toolbox.version import Version
+from exasol.toolbox.util.version import Version
 
 _SUCCESS = 0
 _FAILURE = 1

exasol/toolbox/nox/_release.py

@@ -19,10 +19,7 @@
     new_changes,
     new_unreleased,
 )
-from exasol.toolbox.version import (
-    ReleaseTypes,
-    Version,
-)
+from exasol.toolbox.util.version import ReleaseTypes, Version
 from noxconfig import PROJECT_CONFIG
 
 

exasol/toolbox/release/__init__.py

@@ -4,7 +4,7 @@
 from inspect import cleandoc
 from pathlib import Path
 
-from exasol.toolbox.version import Version
+from exasol.toolbox.util.version import Version
 
 
 def extract_release_notes(file: str | Path) -> str:

exasol/toolbox/sphinx/multiversion/__init__.py

@@ -17,7 +17,7 @@
 
 from exasol.toolbox.sphinx.multiversion.main import main
 from exasol.toolbox.sphinx.multiversion.sphinx import setup
-from exasol.toolbox.util.version import VERSION
+from exasol.toolbox.version import VERSION
 
 __version__ = VERSION
 

exasol/toolbox/sphinx/multiversion/main.py

@@ -25,7 +25,7 @@
     git,
     sphinx,
 )
-from exasol.toolbox.version import Version as ExasolVersion
+from exasol.toolbox.util.version import Version as ExasolVersion
 
 logging.basicConfig(
     level="INFO",

exasol/toolbox/sphinx/multiversion/sphinx.py

@@ -9,8 +9,8 @@
 from sphinx.locale import _
 from sphinx.util import i18n as sphinx_i18n
 
-from exasol.toolbox.util.version import VERSION as PLUGIN_VERSION
-from exasol.toolbox.version import Version as ExasolVersion
+from exasol.toolbox.version import VERSION as PLUGIN_VERSION
+from exasol.toolbox.util.version import Version as ExasolVersion
 
 logger = logging.getLogger(__name__)
 

exasol/toolbox/util/version.py

@@ -1,11 +1,120 @@
-# ATTENTION:
-# This file is generated by exasol/toolbox/nox/_package_version.py when using:
-#   * either "poetry run -- nox -s project:fix"
-#   * or "poetry run -- nox version:check -- <path/version.py> --fix"
-# Do not edit this file manually!
-# If you need to change the version, do so in the pyproject.toml, e.g. by using `poetry version X.Y.Z`.
-MAJOR = 1
-MINOR = 0
-PATCH = 1
-VERSION = f"{MAJOR}.{MINOR}.{PATCH}"
-__version__ = VERSION
+from __future__ import annotations
+
+import subprocess
+from dataclasses import dataclass
+from enum import Enum
+from functools import wraps, total_ordering
+from pathlib import Path
+from shutil import which
+from typing import Any
+
+from exasol.toolbox.error import ToolboxError
+
+
+def _index_or(container, index, default):
+    try:
+        return container[index]
+    except IndexError:
+        return default
+
+
+class ReleaseTypes(Enum):
+    Major = "major"
+    Minor = "minor"
+    Patch = "patch"
+
+    def __str__(self):
+        return self.name.lower()
+
+
+def poetry_command(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        cmd = which("poetry")
+        if not cmd:
+            raise ToolboxError("Couldn't find poetry executable")
+        try:
+            return func(*args, **kwargs)
+        except subprocess.CalledProcessError as ex:
+            raise ToolboxError(f"Failed to execute: {ex.cmd}") from ex
+
+    return wrapper
+
+
+@total_ordering
+@dataclass(frozen=True)
+class Version:
+    major: int
+    minor: int
+    patch: int
+
+    def __str__(self):
+        return f"{self.major}.{self.minor}.{self.patch}"
+
+    def __lt__(self, other: object):
+        if not isinstance(other, Version):
+            return NotImplemented
+        return (
+            self.major < other.major
+            or (self.major <= other.major and self.minor < other.minor)
+            or (
+                self.major <= other.major
+                and self.minor <= other.minor
+                and self.patch < other.patch
+            )
+        )
+
+    def __eq__(self, other: object):
+        if not isinstance(other, Version):
+            return NotImplemented
+        return (
+            self.major == other.major
+            and self.minor == other.minor
+            and self.patch == other.patch
+        )
+
+    @staticmethod
+    def from_string(version):
+        parts = [int(number, base=0) for number in version.split(".")]
+        if len(parts) > 3:
+            raise ValueError(
+                "Version has an invalid format, "
+                f"expected: '<major>.<minor>.<patch>', actual: '{version}'"
+            )
+        version = [_index_or(parts, i, 0) for i in range(3)]
+        return Version(*version)
+
+    @staticmethod
+    @poetry_command
+    def from_poetry():
+        output = subprocess.run(
+            ["poetry", "version", "--no-ansi", "--short"],
+            capture_output=True,
+            text=True,
+        )
+        return Version.from_string(output.stdout.strip())
+
+    @staticmethod
+    @poetry_command
+    def upgrade_version_from_poetry(t: ReleaseTypes):
+        output = subprocess.run(
+            ["poetry", "version", str(t), "--dry-run", "--no-ansi", "--short"],
+            capture_output=True,
+            text=True,
+        )
+        return Version.from_string(output.stdout.strip())
+
+    @staticmethod
+    def from_python_module(path: Path) -> Version:
+        """Retrieve version information from the `version` module"""
+        with open(path, encoding="utf-8") as file:
+            _locals: dict[str, Any] = {}
+            _globals: dict[str, Any] = {}
+            exec(file.read(), _locals, _globals)
+
+            try:
+                version = _globals["VERSION"]
+            except KeyError as ex:
+                raise ToolboxError("Couldn't find version within module") from ex
+
+            return Version.from_string(version)

exasol/toolbox/version.py

@@ -0,0 +1,11 @@
+# ATTENTION:
+# This file is generated by exasol/toolbox/nox/_package_version.py when using:
+#   * either "poetry run -- nox -s project:fix"
+#   * or "poetry run -- nox version:check -- <path/version.py> --fix"
+# Do not edit this file manually!
+# If you need to change the version, do so in the pyproject.toml, e.g. by using `poetry version X.Y.Z`.
+MAJOR = 1
+MINOR = 0
+PATCH = 1
+VERSION = f"{MAJOR}.{MINOR}.{PATCH}"
+__version__ = VERSION

test/unit/cli_test.py

@@ -3,7 +3,7 @@
 import pytest
 
 from exasol.toolbox.cli import version
-from exasol.toolbox.version import Version
+from exasol.toolbox.util.version import Version
 
 
 @pytest.mark.parametrize(