resolve conversation

Author: Jannis-Mittenzwei

doc/changes/unreleased.md

@@ -3,3 +3,7 @@
 ## Bugfixes
 
 * #397: Fix handling empty coverage
+
+## ✨ Features
+
+* [#378](https://github.com/exasol/python-toolbox/pull/378/files): Add Nox task to trigger a release

doc/shared_content/how_release.rst

@@ -8,7 +8,7 @@ Creating a Release
 
     .. code-block:: shell
 
-        nox -s release:prepare -- [-h] [-v | --version VERSION] [-t | --type {major,minor,patch}]
+        nox -s release:prepare -- [-h]
 
 #. Merge your **Pull Request** to the **default branch**
 
@@ -28,13 +28,13 @@ The release failed during pre-release checks
 
     .. code-block:: shell
 
-        git tag -d "${TAG}"
+        git tag -d "<major>.<minor>.<patch>""
 
 #. Delete the remote tag
 
     .. code-block:: shell
 
-        git push --delete origin "${TAG}"
+        git push --delete origin "<major>.<minor>.<patch>"
 
 #. Fix the issue(s) which lead to the failing checks
 #. Start the release process from the beginning

exasol/toolbox/nox/_release.py

@@ -4,7 +4,6 @@
 import re
 import subprocess
 import sys
-from enum import Enum
 from pathlib import Path
 from typing import (
     List,
@@ -21,6 +20,7 @@
 )
 from exasol.toolbox.nox.plugin import NoxTasks
 from exasol.toolbox.release import (
+    ReleaseTypes,
     Version,
     extract_release_notes,
     new_changelog,
@@ -33,24 +33,15 @@
 def _create_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="nox -s release:prepare",
-        usage="nox -s release:experimental -- [-h] [-v | --version VERSION] [-t | --type {major,minor,patch}]",
+        usage="nox -s release:prepare -- [-h] [-t | --type {major,minor,patch}]",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
-    group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument(
-        "-v",
-        "--version",
-        type=cli.version,
-        help="A version string of the following format:" '"NUMBER.NUMBER.NUMBER"',
-        required=False,
-        default=argparse.SUPPRESS,
-    )
-    group.add_argument(
+    parser.add_argument(
         "-t",
         "--type",
         type=ReleaseTypes,
         help="specifies which type of upgrade is to be performed",
-        required=False,
+        required=True,
         choices=[rt.value for rt in list(ReleaseTypes)],
         default=argparse.SUPPRESS,
     )
@@ -106,12 +97,6 @@ def _add_files_to_index(session: Session, files: list[Path]) -> None:
         session.run("git", "add", f"{file}")
 
 
-class ReleaseTypes(Enum):
-    Major = "major"
-    Minor = "minor"
-    Patch = "patch"
-
-
 def _type_release(release_type: ReleaseTypes, old_version: Version) -> Version:
     upgrade = {
         ReleaseTypes.Major: Version(old_version.major + 1, 0, 0),
@@ -123,29 +108,6 @@ def _type_release(release_type: ReleaseTypes, old_version: Version) -> Version:
     return upgrade[release_type]
 
 
-def _version_control(
-    session: Session,
-    args: argparse.Namespace,
-) -> Version:
-    has_release_version = hasattr(args, "version")
-    has_release_type = hasattr(args, "type")
-
-    old_version = Version.from_poetry()
-
-    if has_release_version and not has_release_type:
-        if not _is_valid_version(old=old_version, new=args.version):
-            session.error(
-                f"Invalid version: the release version ({args.version}) "
-                f"must be greater than or equal to the current version ({args.version})"
-            )
-        return args.version
-
-    if not has_release_version and has_release_type:
-        return _type_release(release_type=args.type, old_version=old_version)
-
-    session.error("version not allowed with type")
-
-
 class ReleaseError(Exception):
     """Error during trigger release"""
 
@@ -188,8 +150,7 @@ def prepare_release(session: Session, python=False) -> None:
     parser = _create_parser()
     args = parser.parse_args(session.posargs)
 
-    new_version = _version_control(session, args)
-    print(f"release version: {new_version}")
+    new_version = Version.upgrade_version_from_poetry(args.type)
 
     if not args.no_branch and not args.no_add:
         session.run("git", "switch", "-c", f"release/prepare-{new_version}")
@@ -236,4 +197,4 @@ def prepare_release(session: Session, python=False) -> None:
 @nox.session(name="release:trigger", python=False)
 def trigger_release(session: Session) -> None:
     """releases the project automatically"""
-    print(_trigger_release())
+    print(f"new version: {_trigger_release()}")

exasol/toolbox/release/__init__.py

@@ -3,6 +3,7 @@
 import subprocess
 from dataclasses import dataclass
 from datetime import datetime
+from enum import Enum
 from functools import total_ordering
 from inspect import cleandoc
 from pathlib import Path
@@ -18,6 +19,15 @@ def _index_or(container, index, default):
         return default
 
 
+class ReleaseTypes(Enum):
+    Major = "major"
+    Minor = "minor"
+    Patch = "patch"
+
+    def __str__(self):
+        return self.name.lower()
+
+
 @total_ordering
 @dataclass(frozen=True)
 class Version:
@@ -77,6 +87,23 @@ def from_poetry():
 
         return Version.from_string(version)
 
+    @staticmethod
+    def upgrade_version_from_poetry(t: ReleaseTypes):
+        poetry = which("poetry")
+        if not poetry:
+            raise ToolboxError("Couldn't find poetry executable")
+
+        try:
+            result = subprocess.run(
+                [poetry, "version", str(t), "--dry-run", "--no-ansi", "--short"],
+                capture_output=True,
+            )
+        except subprocess.CalledProcessError as ex:
+            raise ToolboxError() from ex
+        version = result.stdout.decode().strip()
+
+        return Version.from_string(version)
+
 
 def extract_release_notes(file: str | Path) -> str:
     """