commitizen 4.11.4__tar.gz → 4.11.5__tar.gz

{commitizen-4.11.4 → commitizen-4.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: commitizen
-Version: 4.11.4
+Version: 4.11.5
 Summary: Python commitizen client tool
 Keywords: commitizen,conventional,commits,git
 Author: Santiago Fraire

commitizen-4.11.5/commitizen/__version__.py

@@ -0,0 +1 @@
+__version__ = "4.11.5"

commitizen-4.11.5/commitizen/config/__init__.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from commitizen import defaults, git, out
+from commitizen.config.factory import create_config
+from commitizen.exceptions import ConfigFileIsEmpty, ConfigFileNotFound
+
+from .base_config import BaseConfig
+
+
+def _resolve_config_paths() -> list[Path]:
+    git_project_root = git.find_git_project_root()
+    cfg_search_paths = [Path(".")]
+
+    if git_project_root and not cfg_search_paths[0].samefile(git_project_root):
+        cfg_search_paths.append(git_project_root)
+
+    # The following algorithm is ugly, but we need to ensure that the order of the candidates are preserved before v5.
+    # Also, the number of possible config files is limited, so the complexity is not a problem.
+    candidates: list[Path] = []
+    for dir in cfg_search_paths:
+        for filename in defaults.CONFIG_FILES:
+            out_path = dir / Path(filename)
+            if out_path.exists() and all(not out_path.samefile(p) for p in candidates):
+                candidates.append(out_path)
+    return candidates
+
+
+def _create_config_from_path(path: Path) -> BaseConfig:
+    with open(path, "rb") as f:
+        data: bytes = f.read()
+
+    return create_config(data=data, path=path)
+
+
+def read_cfg(filepath: str | None = None) -> BaseConfig:
+    if filepath is not None:
+        conf_path = Path(filepath)
+        if not conf_path.exists():
+            raise ConfigFileNotFound()
+        conf = _create_config_from_path(conf_path)
+        if conf.is_empty_config:
+            raise ConfigFileIsEmpty()
+        return conf
+
+    config_candidate_paths = _resolve_config_paths()
+
+    # Check for multiple config files and warn the user
+    config_candidates_exclude_pyproject = [
+        path for path in config_candidate_paths if path.name != "pyproject.toml"
+    ]
+
+    for config_candidate_path in config_candidate_paths:
+        conf = _create_config_from_path(config_candidate_path)
+        if not conf.is_empty_config:
+            if len(config_candidates_exclude_pyproject) > 1:
+                out.warn(
+                    f"Multiple config files detected: {', '.join(map(str, config_candidates_exclude_pyproject))}. "
+                    f"Using config file: '{config_candidate_path}'."
+                )
+            return conf
+
+    return BaseConfig()

{commitizen-4.11.4 → commitizen-4.11.5}/commitizen/defaults.py

@@ -67,15 +67,15 @@ class Settings(TypedDict, total=False):
     breaking_change_exclamation_in_title: bool
 
 
-CONFIG_FILES: list[str] = [
-    "pyproject.toml",
+CONFIG_FILES: tuple[str, ...] = (
     ".cz.toml",
+    "cz.toml",
     ".cz.json",
     "cz.json",
     ".cz.yaml",
     "cz.yaml",
-    "cz.toml",
-]
+    "pyproject.toml",
+)
 ENCODING = "utf-8"
 
 DEFAULT_SETTINGS: Settings = {

{commitizen-4.11.4 → commitizen-4.11.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commitizen"
-version = "4.11.4"
+version = "4.11.5"
 description = "Python commitizen client tool"
 authors = [{ name = "Santiago Fraire", email = "santiwilly@gmail.com" }]
 maintainers = [

commitizen-4.11.4/commitizen/__version__.py

@@ -1 +0,0 @@
-__version__ = "4.11.4"

commitizen-4.11.4/commitizen/config/__init__.py

@@ -1,62 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-from commitizen import defaults, git, out
-from commitizen.config.factory import create_config
-from commitizen.exceptions import ConfigFileIsEmpty, ConfigFileNotFound
-
-from .base_config import BaseConfig
-
-if TYPE_CHECKING:
-    from collections.abc import Generator
-
-
-def _resolve_config_paths(filepath: str | None = None) -> Generator[Path, None, None]:
-    if filepath is not None:
-        out_path = Path(filepath)
-        if not out_path.exists():
-            raise ConfigFileNotFound()
-
-        yield out_path
-        return
-
-    git_project_root = git.find_git_project_root()
-    cfg_search_paths = [Path(".")]
-    if git_project_root:
-        cfg_search_paths.append(git_project_root)
-
-    for path in cfg_search_paths:
-        for filename in defaults.CONFIG_FILES:
-            out_path = path / Path(filename)
-            if out_path.exists():
-                yield out_path
-
-
-def read_cfg(filepath: str | None = None) -> BaseConfig:
-    config_candidates = list(_resolve_config_paths(filepath))
-
-    # Check for multiple config files and warn the user
-    config_candidates_exclude_pyproject = [
-        path for path in config_candidates if path.name != "pyproject.toml"
-    ]
-    if len(config_candidates_exclude_pyproject) > 1:
-        filenames = [path.name for path in config_candidates_exclude_pyproject]
-        out.warn(
-            f"Multiple config files detected: {', '.join(filenames)}. "
-            f"Using config file: '{filenames[0]}'."
-        )
-
-    for filename in config_candidates:
-        with open(filename, "rb") as f:
-            data: bytes = f.read()
-
-        conf = create_config(data=data, path=filename)
-        if not conf.is_empty_config:
-            return conf
-
-        if filepath is not None:
-            raise ConfigFileIsEmpty()
-
-    return BaseConfig()