gha-utils 4.15.0__tar.gz → 4.15.2__tar.gz

{gha_utils-4.15.0 → gha_utils-4.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gha-utils
-Version: 4.15.0
+Version: 4.15.2
 Summary: ⚙️ CLI helpers for GitHub Actions + reuseable workflows
 Author-email: Kevin Deldycke <kevin@deldycke.com>
 Project-URL: Homepage, https://github.com/kdeldycke/workflows

{gha_utils-4.15.0 → gha_utils-4.15.2}/gha_utils/__init__.py

@@ -17,4 +17,4 @@
 
 from __future__ import annotations
 
-__version__ = "4.15.0"
+__version__ = "4.15.2"

{gha_utils-4.15.0 → gha_utils-4.15.2}/gha_utils/cli.py

@@ -286,8 +286,6 @@ def mailmap_sync(ctx, source, create_if_missing, destination_mailmap):
 @option(
     "-F",
     "--plan-file",
-    # TODO: remove deprecated --plan option to avoid confusion.
-    "--plan",
     type=file_path(exists=True, readable=True, resolve_path=True),
     multiple=True,
     metavar="FILE_PATH",

{gha_utils-4.15.0 → gha_utils-4.15.2}/gha_utils/metadata.py

@@ -796,13 +796,20 @@ class Metadata:
     def current_version(self) -> str | None:
         """Returns the current version.
 
-        I.e. the version of the most recent commit.
+        Current version is fetched from the ``bump-my-version`` configuration file.
+
+        During a release we get two commits bundled into a single event. The first one
+        is the release commit itself freezing the version to the release number. The
+        second one is the commit that bumps the version to the next one. In this situation,
+        the current version returned is the one from the most recent commit.
         """
         version = None
         if self.new_commits_matrix:
             details = self.new_commits_matrix.get("include")
             if details:
                 version = details[0].get("current_version")
+        else:
+            version = self.get_current_version()
         return version
 
     @cached_property

{gha_utils-4.15.0 → gha_utils-4.15.2}/gha_utils/test_plan.py

@@ -96,11 +96,16 @@ class CLITestCase:
                     if isinstance(field_data, str) or not isinstance(
                         field_data, Sequence
                     ):
-                        # CLI parameters needs to be split on Unix-like systems.
-                        # XXX If we need the same for Windows, have a look at:
-                        # https://github.com/maxpat78/w32lex
-                        if field_id == "cli_parameters" and sys.platform != "win32":
-                            field_data = tuple(shlex.split(field_data))
+                        # CLI parameters provided as a long string needs to be split so
+                        # that each argument is a separate item in the final tuple.
+                        if field_id == "cli_parameters":
+                            # XXX Maybe we should rely on a library to parse them:
+                            # https://github.com/maxpat78/w32lex
+                            if sys.platform == "win32":
+                                field_data = field_data.split()
+                            # For Unix platforms, we have the dedicated shlex module.
+                            else:
+                                field_data = shlex.split(field_data)
                         else:
                             field_data = (field_data,)
 

{gha_utils-4.15.0 → gha_utils-4.15.2}/gha_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gha-utils
-Version: 4.15.0
+Version: 4.15.2
 Summary: ⚙️ CLI helpers for GitHub Actions + reuseable workflows
 Author-email: Kevin Deldycke <kevin@deldycke.com>
 Project-URL: Homepage, https://github.com/kdeldycke/workflows

{gha_utils-4.15.0 → gha_utils-4.15.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 # Docs: https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
 name = "gha-utils"
-version = "4.15.0"
+version = "4.15.2"
 # Python versions and their status: https://devguide.python.org/versions/
 requires-python = ">= 3.11"
 description = "⚙️ CLI helpers for GitHub Actions + reuseable workflows"
@@ -136,7 +136,7 @@ addopts = [
 xfail_strict = true
 
 [tool.bumpversion]
-current_version = "4.15.0"
+current_version = "4.15.2"
 allow_dirty = true
 ignore_missing_files = true
 

{gha_utils-4.15.0 → gha_utils-4.15.2}/tests/test_metadata.py

@@ -36,11 +36,16 @@ def test_metadata_github_format():
             r"blacken_docs_params=--target-version py311 "
             r"--target-version py312 --target-version py313\n"
             r"mypy_params=--python-version 3\.11\n"
-            r"current_version=\n"
+            r"current_version=[0-9\.]+\n"
             r"released_version=\n"
             r"is_sphinx=false\n"
             r"active_autodoc=false\n"
-            r"release_notes=\n"
+            r"release_notes<<ghadelimiter_[0-9]+\n"
+            r"### Changes\n\n"
+            r"> \[\!IMPORTANT\]\n"
+            r"> This version is not released yet and is under active development.\n\n"
+            r".+\n"
+            r"ghadelimiter_[0-9]+\n"
             r"new_commits_matrix=\n"
             r"release_commits_matrix=\n"
             r'nuitka_matrix=\{"os": \["ubuntu-24\.04", "ubuntu-24\.04-arm", '
@@ -76,6 +81,7 @@ def test_metadata_github_format():
             r'"bin_name": "gha-utils-windows-x64-build-[a-z0-9]+\.exe"\}\]\}\n'
         ),
         metadata.dump(Dialects.github),
+        re.DOTALL,
     )
 
 
@@ -97,11 +103,14 @@ def test_metadata_plain_format():
             r"'--target-version py312', "
             r"'--target-version py313'\), "
             r"'mypy_params': '--python-version 3\.11', "
-            r"'current_version': None, "
+            r"'current_version': '[0-9\.]+', "
             r"'released_version': None, "
             r"'is_sphinx': False, "
             r"'active_autodoc': False, "
-            r"'release_notes': None, "
+            r"'release_notes': '### Changes\\n\\n"
+            r"> \[\!IMPORTANT\]\\n"
+            r"> This version is not released yet and is under active development.\\n\\n"
+            r".+', "
             r"'new_commits_matrix': None, "
             r"'release_commits_matrix': None, "
             r"'nuitka_matrix': <Matrix: \{"
@@ -139,4 +148,5 @@ def test_metadata_plain_format():
             r"exclude=\(\)>\}"
         ),
         metadata.dump(Dialects.plain),
+        re.DOTALL,
     )