Fix current_version for all branches

pulp · Nov 25, 2024 · e956901 · e956901
1 parent 78ad960
commit e956901
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/templates/github/.ci/scripts/check_release.py b/templates/github/.ci/scripts/check_release.py
@@ -37,7 +37,10 @@ def template_config():
 def current_version(repo, commitish):
     try:
         pyproject_toml = tomllib.loads(repo.git.show(f"{commitish}:pyproject.toml"))
-        current_version = pyproject_toml["project"]["version"]
+        try:
+            current_version = pyproject_toml["project"]["version"]
+        except Exception:
+            current_version = pyproject_toml["tool"]["bumpversion"]["current_version"]
     except Exception:
         current_version = repo.git.grep(
             "current_version", commitish, "--", ".bumpversion.cfg"

diff --git a/utils.py b/utils.py
@@ -72,7 +72,10 @@ def current_version(plugin_root_path):
     try:
         path = plugin_root_path / "pyproject.toml"
         pyproject_toml = tomllib.loads(path.read_text())
-        current_version = pyproject_toml["project"]["version"]
+        try:
+            current_version = pyproject_toml["project"]["version"]
+        except Exception:
+            current_version = pyproject_toml["tool"]["bumpversion"]["current_version"]
     except Exception:
         try:
             path = plugin_root_path / ".bumpversion.cfg"