Merge pull request #29 from callowayproject/28-add-short_branch_name-to-version-rendering-context

Adds `short_branch_name` to version rendering context

Author: coordt

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.272'
+    rev: 'v0.0.275'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -39,7 +39,7 @@ repos:
         args: ['--baseline', '.secrets.baseline']
         additional_dependencies: ["gibberish-detector"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.3.0
+    rev: v1.4.1
     hooks:
       - id: mypy
         args: [--no-strict-optional, --ignore-missing-imports]
@@ -59,6 +59,6 @@ repos:
       - id: interrogate
         exclude: test.*
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.23.1
+    rev: 0.23.2
     hooks:
       - id: check-azure-pipelines

bumpversion/scm.py

@@ -2,11 +2,12 @@
 
 import logging
 import os
+import re
 import subprocess
 from dataclasses import dataclass
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import TYPE_CHECKING, List, MutableMapping, Optional, Type, Union
+from typing import TYPE_CHECKING, ClassVar, List, MutableMapping, Optional, Type, Union
 
 if TYPE_CHECKING:  # pragma: no-coverage
     from bumpversion.config import Config
@@ -25,6 +26,7 @@ class SCMInfo:
     distance_to_latest_tag: Optional[int] = None
     current_version: Optional[str] = None
     branch_name: Optional[str] = None
+    short_branch_name: Optional[str] = None
     dirty: Optional[bool] = None
 
     def __str__(self):
@@ -42,9 +44,9 @@ def __repr__(self):
 class SourceCodeManager:
     """Base class for version control systems."""
 
-    _TEST_USABLE_COMMAND: List[str] = []
-    _COMMIT_COMMAND: List[str] = []
-    _ALL_TAGS_COMMAND: List[str] = []
+    _TEST_USABLE_COMMAND: ClassVar[List[str]] = []
+    _COMMIT_COMMAND: ClassVar[List[str]] = []
+    _ALL_TAGS_COMMAND: ClassVar[List[str]] = []
 
     @classmethod
     def commit(cls, message: str, current_version: str, new_version: str, extra_args: Optional[list] = None) -> None:
@@ -199,9 +201,9 @@ def __repr__(self):
 class Git(SourceCodeManager):
     """Git implementation."""
 
-    _TEST_USABLE_COMMAND = ["git", "rev-parse", "--git-dir"]
-    _COMMIT_COMMAND = ["git", "commit", "-F"]
-    _ALL_TAGS_COMMAND = ["git", "tag", "--list"]
+    _TEST_USABLE_COMMAND: ClassVar[List[str]] = ["git", "rev-parse", "--git-dir"]
+    _COMMIT_COMMAND: ClassVar[List[str]] = ["git", "commit", "-F"]
+    _ALL_TAGS_COMMAND: ClassVar[List[str]] = ["git", "tag", "--list"]
 
     @classmethod
     def assert_nondirty(cls) -> None:
@@ -245,11 +247,12 @@ def latest_tag_info(cls, tag_pattern: str) -> SCMInfo:
             git_cmd = ["git", "rev-parse", "--abbrev-ref", "HEAD"]
             result = subprocess.run(git_cmd, text=True, check=True, capture_output=True)  # noqa: S603
             branch_name = result.stdout.strip()
+            short_branch_name = re.sub(r"([^a-zA-Z0-9]*)", "", branch_name).lower()[:20]
         except subprocess.CalledProcessError as e:
             logger.debug("Error when running git describe: %s", e.stderr)
             return SCMInfo(tool=cls)
 
-        info = SCMInfo(tool=cls, branch_name=branch_name)
+        info = SCMInfo(tool=cls, branch_name=branch_name, short_branch_name=short_branch_name)
 
         if describe_out[-1].strip() == "dirty":
             info.dirty = True
@@ -292,9 +295,9 @@ def tag(cls, name: str, sign: bool = False, message: Optional[str] = None) -> No
 class Mercurial(SourceCodeManager):
     """Mercurial implementation."""
 
-    _TEST_USABLE_COMMAND = ["hg", "root"]
-    _COMMIT_COMMAND = ["hg", "commit", "--logfile"]
-    _ALL_TAGS_COMMAND = ["hg", "log", '--rev="tag()"', '--template="{tags}\n"']
+    _TEST_USABLE_COMMAND: ClassVar[List[str]] = ["hg", "root"]
+    _COMMIT_COMMAND: ClassVar[List[str]] = ["hg", "commit", "--logfile"]
+    _ALL_TAGS_COMMAND: ClassVar[List[str]] = ["hg", "log", '--rev="tag()"', '--template="{tags}\n"']
 
     @classmethod
     def latest_tag_info(cls, tag_pattern: str) -> SCMInfo:

bumpversion/version_part.py

@@ -134,7 +134,7 @@ def __init__(
         serialize: List[str],
         search: str,
         replace: str,
-        part_configs: Dict[str, VersionPartConfig] = None,
+        part_configs: Optional[Dict[str, VersionPartConfig]] = None,
     ):
         try:
             self.parse_regex = re.compile(parse, re.VERBOSE)

tests/fixtures/pep440.toml

@@ -0,0 +1,75 @@
+[tool.bumpversion]
+allow_dirty = false
+commit = false
+message = "Bump version: {current_version} → {new_version}"
+commit_args = ""
+tag = false
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+current_version = "1.0.0"
+parse = """(?x)
+(?:
+    (?P<release>
+        (?P<major>[0-9]+)
+        (?:
+            \\.(?P<minor>[0-9]+)
+            (?:
+                \\.(?P<patch>[0-9]+)
+            )?
+        )?
+    )
+    (?P<prerelease>
+        [-_\\.]?
+        (?P<pre_label>a|b|rc)
+        [-_\\.]?
+        (?P<pre_n>[0-9]+)?
+    )?
+    (?P<postrelease>
+        (?:
+            [-_\\.]?
+            (?P<post_label>post|rev|r)
+            [-_\\.]?
+            (?P<post_n>[0-9]+)?
+        )
+    )?
+    (?P<dev>
+        [-_\\.]?
+        (?P<dev_label>dev)
+        [-_\\.]?
+        (?P<dev_n>[0-9]+)?
+    )?
+)
+(?:\\+(?P<local>[a-z0-9]+(?:[-_\\.][a-z0-9]+)*))?
+"""
+serialize = [
+    "{major}.{minor}.{patch}.{dev_label}{distance_to_latest_tag}+{short_branch_name}",
+#    "{major}.{minor}.{patch}{pre_label}{pre_n}",
+#    "{major}.{minor}.{patch}+{branch_name}",
+    "{major}.{minor}.{patch}",
+]
+search = "{current_version}"
+replace = "{new_version}"
+
+[tool.bumpversion.parts.pre_label]
+values = ["final", "a", "b", "rc"]
+
+[tool.bumpversion.parts.pre_n]
+first_value = 1
+
+[tool.bumpversion.parts.post_label]
+values = ["final", "post"]
+
+[tool.bumpversion.parts.post_n]
+first_value = 1
+
+
+[tool.bumpversion.parts.dev_label]
+values = ["final", "dev"]
+independent = true
+
+[tool.bumpversion.parts.dev_n]
+first_value = 1
+
+[tool.bumpversion.parts.local]
+independent = true

tests/test_config.py

@@ -5,6 +5,7 @@
 from textwrap import dedent
 
 import pytest
+from click.testing import CliRunner, Result
 from pytest import param
 
 from bumpversion import config
@@ -194,3 +195,54 @@ def test_update_config_file(tmp_path: Path, cfg_file_name: str, expected_diff: s
     new_content = cfg_path.read_text().splitlines(keepends=True)
     difference = difflib.context_diff(original_content, new_content, n=0)
     assert "".join(difference) == expected_diff
+
+
+def test_pep440_config(git_repo: Path, fixtures_path: Path):
+    """
+    Check the PEP440 config file.
+    """
+    from bumpversion.utils import get_context
+    from bumpversion.bump import get_next_version
+    from bumpversion import cli
+    import subprocess
+
+    # Arrange
+
+    cfg_path = git_repo / "pyproject.toml"
+    orig_path = fixtures_path / "pep440.toml"
+    cfg_path.write_text(orig_path.read_text())
+    version_path = git_repo / "VERSION"
+    version_path.write_text("1.0.0")
+    readme_path = git_repo / "README.md"
+    runner: CliRunner = CliRunner()
+
+    with inside_dir(git_repo):
+        subprocess.run(["git", "add", "VERSION"], check=True, capture_output=True)
+        subprocess.run(["git", "commit", "-m", "initial commit"], check=True, capture_output=True)
+        subprocess.run(["git", "tag", "v1.0.0"], check=True, capture_output=True)
+
+        cfg = config.get_configuration(cfg_path)
+        ctx = get_context(cfg)
+        version = cfg.version_config.parse(cfg.current_version)
+        next_version = get_next_version(version, cfg, "patch", None)
+        next_version_str = cfg.version_config.serialize(next_version, ctx)
+        assert next_version_str == "1.0.1"
+
+        subprocess.run(["git", "checkout", "-b", "my-really-LONG-branch_name"], check=True, capture_output=True)
+        readme_path.write_text("This is my branch!")
+        result: Result = runner.invoke(cli.cli, ["bump", "dev_label", "--no-tag"])
+        assert result.exit_code == 0
+        cfg = config.get_configuration(cfg_path)
+        assert cfg.current_version == "1.0.0.dev0+myreallylongbranchna"
+
+        # try:
+        #     subprocess.run(["git", "add", "README.md"], check=True, capture_output=True)
+        #     subprocess.run(["git", "commit", "-am", "my branch commit"], check=True, capture_output=True)
+        # except subprocess.CalledProcessError as e:
+        #     print(e.stdout)
+        #     print(e.stderr)
+        #     raise
+        # result: Result = runner.invoke(cli.cli, ["bump", "dev_label", "--no-tag"])
+        # assert result.exit_code == 0
+        # cfg = config.get_configuration(cfg_path)
+        # assert cfg.current_version == "1.0.0.dev1+myreallylongbranchna"