add --no-git-tag

Author: grizz

src/ctl/plugins/git.py

@@ -204,6 +204,25 @@ def execute(self, **kwargs):
 
         fn(**kwargs)
 
+    def find_git_root(self, start_path=None):
+        """
+        Find git root by walking up from start_path or checkout_path.
+
+        **Arguments**
+
+        - start_path (`str`): path to start searching from (default: checkout_path)
+
+        **Returns**
+
+        git root path (`str`) or `None` if not found
+        """
+        path = os.path.abspath(start_path or self.checkout_path)
+        while path != "/":
+            if os.path.exists(os.path.join(path, ".git")):
+                return path
+            path = os.path.dirname(path)
+        return None
+
     def command(self, *command):
         """
         Prepare git command to use with `run_git_command`
@@ -218,12 +237,15 @@ def command(self, *command):
 
         prepared command (`list`)
         """
+        git_root = self.find_git_root()
+        if git_root is None:
+            git_root = self.checkout_path  # fallback
         return [
             "git",
             "--git-dir",
-            os.path.join(self.checkout_path, ".git"),
+            os.path.join(git_root, ".git"),
             "--work-tree",
-            self.checkout_path,
+            git_root,
         ] + list(command)
 
     def run_git_command(self, command):

src/ctl/plugins/semver2.py

@@ -44,6 +44,13 @@ def add_arguments(cls, parser, plugin_config, confu_cli_args):
             type=str,
             help="tag a prerelease with the specified prerlease name",
         )
+        op_tag_parser.add_argument(
+            "--no-git-tag",
+            dest="no_git_tag",
+            action="store_true",
+            help="Skip creating git tag (still commits version file changes)",
+            default=False,
+        )
 
         # operation `bump`
         op_bump_parser = parsers.get("op_bump_parser")
@@ -174,9 +181,7 @@ def bump(self, version, repo, **kwargs):
 
         self.log.info(f"Bumping semantic version: {current} to {new_version}")
 
-        no_git_tag = kwargs.pop("no_git_tag", False)
-        if not no_git_tag:
-            self.tag(version=str(new_version), repo=repo, **kwargs)
+        self.tag(version=str(new_version), repo=repo, **kwargs)
 
     @expose("ctl.{plugin_name}.release")
     def release(self, repo, **kwargs):

src/ctl/plugins/version_base.py

@@ -228,15 +228,31 @@ def update_ctl_version(self, repo_plugin, version):
     def update_pyproject_version(self, repo_plugin, version):
         """
         Writes a new version to the pyproject.toml file
-        if it exists
+        if it exists. Supports both Poetry format ([tool.poetry].version)
+        and PEP 621 format ([project].version).
         """
 
         try:
             pyproject_path = os.path.join(repo_plugin.checkout_path, "pyproject.toml")
             pyproject = munge.load_datafile(
                 "pyproject.toml", search_path=(repo_plugin.checkout_path)
             )
-            pyproject["tool"]["poetry"]["version"] = version
+
+            updated = False
+
+            # Check for Poetry format: [tool.poetry].version
+            if "tool" in pyproject and "poetry" in pyproject["tool"]:
+                if "version" in pyproject["tool"]["poetry"]:
+                    pyproject["tool"]["poetry"]["version"] = version
+                    updated = True
+
+            # Check for PEP 621 format: [project].version
+            if "project" in pyproject and "version" in pyproject["project"]:
+                pyproject["project"]["version"] = version
+                updated = True
+
+            if not updated:
+                return None
 
             codec = munge.get_codec("toml")
 
@@ -246,7 +262,8 @@ def update_pyproject_version(self, repo_plugin, version):
 
         except OSError as exc:
             if "not found" in str(exc):
-                return
+                return None
+            raise
 
     def validate_changelog(self, repo, version, data_file="CHANGELOG.yaml"):
         """

tests/test_plugin_semver2.py

@@ -87,8 +87,8 @@ def test_bump(tmpdir, ctlr):
         plugin.bump(version="invalid", repo="dummy_repo")
 
     plugin.bump(version="patch", repo="dummy_repo", no_git_tag=True)
-    assert dummy_repo.version == "2.0.0"
-    assert not dummy_repo.has_tag("2.0.1")
+    assert dummy_repo.version == "2.0.1"  # version IS bumped
+    assert not dummy_repo.has_tag("2.0.1")  # but no tag is created
 
 
 def test_bump_w_prerelease_flag(tmpdir, ctlr):
@@ -100,8 +100,8 @@ def test_bump_w_prerelease_flag(tmpdir, ctlr):
     assert dummy_repo.has_tag("1.0.1-rc.1")
 
     plugin.bump(version="patch", repo="dummy_repo", prerelease="beta", no_git_tag=True)
-    assert dummy_repo.version == "1.0.1-rc.1"
-    assert not dummy_repo.has_tag("1.0.2-beta.1")
+    assert dummy_repo.version == "1.0.2-beta.1"  # version IS bumped
+    assert not dummy_repo.has_tag("1.0.2-beta.1")  # but no tag is created
 
 
 def test_bump_prerelease_version(tmpdir, ctlr):
@@ -116,8 +116,8 @@ def test_bump_prerelease_version(tmpdir, ctlr):
     assert dummy_repo.has_tag("1.0.0-rc.3")
 
     plugin.bump(version="prerelease", repo="dummy_repo", no_git_tag=True)
-    assert dummy_repo.version == "1.0.0-rc.3"
-    assert not dummy_repo.has_tag("1.0.0-rc.4")
+    assert dummy_repo.version == "1.0.0-rc.4"  # version IS bumped
+    assert not dummy_repo.has_tag("1.0.0-rc.4")  # but no tag is created
 
 
 def test_release(tmpdir, ctlr):