resolve conversation

Author: Jannis-Mittenzwei

exasol/toolbox/nox/_package_version.py

@@ -6,15 +6,10 @@
     Namespace,
 )
 from collections import namedtuple
-from collections.abc import Iterable
 from inspect import cleandoc
 from pathlib import Path
 from shutil import which
-from typing import (
-    Any,
-    Dict,
-    Union,
-)
+from typing import Any
 
 import nox
 from nox import Session
@@ -29,9 +24,9 @@
     # 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"
+    #   * 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 project.toml, e.g. by using `poetry version X.Y.Z`.
+    # If you need to change the version, do so in the pyproject.toml, e.g. by using `poetry version X.Y.Z`.
     MAJOR = {major}
     MINOR = {minor}
     PATCH = {patch}
@@ -93,7 +88,7 @@ def write_version_module(version: Version, path: str, exists_ok: bool = True) ->
 
 def _create_parser() -> ArgumentParser:
     parser = ArgumentParser(
-        prog="nox -s version:check",
+        prog="nox -s version:check --",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
     parser.add_argument("version_module", help="Path to version module")
@@ -122,7 +117,7 @@ def _main_debug(args: Namespace) -> int:
     if args.fix:
         write_version_module(poetry_version, args.version_module)
 
-    if not module_version == poetry_version:
+    if module_version != poetry_version:
         print(
             f"Version in pyproject.toml {poetry_version} and {args.version_module} {module_version} do not match!"
         )

exasol/toolbox/nox/_shared.py

@@ -47,8 +47,8 @@ def _deny_filter(files: Iterable[Path], deny_list: Iterable[str]) -> Iterable[Pa
 
 
 def _version(session: Session, mode: Mode, version_file: Path) -> None:
-    command = ["nox", "-s", "version:check"]
-    command = command if mode == Mode.Check else command + ["--"] + ["--fix"]
+    command = ["nox", "-s", "version:check", "--"]
+    command = command if mode == Mode.Check else command + ["--fix"]
     session.run(*command, f"{version_file}")
 
 

exasol/toolbox/templates/github/workflows/checks.yml

@@ -22,7 +22,7 @@ jobs:
         run: |
           echo "Please enable the version check by replacing this output with shell command bellow:"
           echo ""
-          echo "poetry run nox -s version:check -- <<VERSION_PY>>"
+          echo "poetry run -- nox -s version:check -- <<VERSION_PY>>"
           echo ""
           echo "Note: <<VERSION_PY>> needs to point to the version file of the project (version.py)."
           exit 1

exasol/toolbox/version.py

@@ -1,9 +1,9 @@
 # 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"
+#   * 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 project.toml, e.g. by using `poetry version X.Y.Z`.
+# 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

project-template/{{cookiecutter.repo_name}}/exasol/{{cookiecutter.package_name}}/version.py

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