Fixed logging and regex regression in 3.11

Author: coordt

.pre-commit-config.yaml

@@ -59,3 +59,5 @@ repos:
     rev: 0.27.1
     hooks:
       - id: check-azure-pipelines
+ci:
+  autofix_prs: false

bumpversion/cli.py

@@ -11,9 +11,8 @@
 from bumpversion.config import get_configuration
 from bumpversion.config.files import find_config_file
 from bumpversion.files import ConfiguredFile, modify_files
-from bumpversion.logging import setup_logging
 from bumpversion.show import do_show, log_list
-from bumpversion.ui import print_warning
+from bumpversion.ui import print_warning, setup_logging
 from bumpversion.utils import get_context, get_overrides
 
 logger = logging.getLogger(__name__)

bumpversion/logging.py

@@ -9,6 +9,8 @@
 from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, ClassVar, List, MutableMapping, Optional, Type, Union
 
+from utils import extract_regex_flags
+
 if TYPE_CHECKING:  # pragma: no-coverage
     from bumpversion.config import Config
 
@@ -113,7 +115,9 @@ def get_all_tags(cls) -> List[str]:
     def get_version_from_tag(cls, tag: str, tag_name: str, parse_pattern: str) -> Optional[str]:
         """Return the version from a tag."""
         version_pattern = parse_pattern.replace("\\\\", "\\")
+        version_pattern, regex_flags = extract_regex_flags(version_pattern)
         rep = tag_name.replace("{new_version}", f"(?P<current_version>{version_pattern})")
+        rep = f"{regex_flags}{rep}"
         tag_regex = re.compile(rep)
         return match["current_version"] if (match := tag_regex.match(tag)) else None
 

bumpversion/scm.py

@@ -1,5 +1,33 @@
 """Utilities for user interface."""
+import logging
+
+import click
 from click import UsageError, secho
+from rich.logging import RichHandler
+
+logger = logging.getLogger("bumpversion")
+
+VERBOSITY = {
+    0: logging.WARNING,
+    1: logging.INFO,
+    2: logging.DEBUG,
+}
+
+
+def setup_logging(verbose: int = 0) -> None:
+    """Configure the logging."""
+    logging.basicConfig(
+        level=VERBOSITY.get(verbose, logging.DEBUG),
+        format="%(message)s",
+        datefmt="[%X]",
+        handlers=[
+            RichHandler(
+                rich_tracebacks=True, show_level=False, show_path=False, show_time=False, tracebacks_suppress=[click]
+            )
+        ],
+    )
+    root_logger = logging.getLogger("")
+    root_logger.setLevel(VERBOSITY.get(verbose, logging.DEBUG))
 
 
 def print_info(msg: str) -> None:

bumpversion/ui.py

@@ -2,13 +2,30 @@
 import string
 from collections import ChainMap
 from dataclasses import asdict
-from typing import TYPE_CHECKING, Any, List, Optional
+from typing import TYPE_CHECKING, Any, List, Optional, Tuple
 
 if TYPE_CHECKING:  # pragma: no-coverage
     from bumpversion.config import Config
     from bumpversion.version_part import Version
 
 
+def extract_regex_flags(regex_pattern: str) -> Tuple[str, str]:
+    """
+    Extract the regex flags from the regex pattern.
+
+    Args:
+        regex_pattern: The pattern that might start with regex flags
+
+    Returns:
+        A tuple of the regex pattern without the flag string and regex flag string
+    """
+    import re
+
+    flag_pattern = r"^(\(\?[aiLmsux]+\))"
+    bits = re.split(flag_pattern, regex_pattern)
+    return (regex_pattern, "") if len(bits) == 1 else (bits[2], bits[1])
+
+
 def recursive_sort_dict(input_value: Any) -> Any:
     """Sort a dictionary recursively."""
     if not isinstance(input_value, dict):

bumpversion/utils.py

@@ -7,7 +7,7 @@
 
 from bumpversion import scm
 from bumpversion.exceptions import DirtyWorkingDirectoryError
-from bumpversion.logging import setup_logging
+from bumpversion.ui import setup_logging
 from tests.conftest import get_config_data, inside_dir