commitizen 4.13.0__py3-none-any.whl → 4.13.1__py3-none-any.whl

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.13.0"
+__version__ = "4.13.1"

commitizen/config/__init__.py

@@ -13,23 +13,17 @@ def _resolve_config_candidates() -> list[BaseConfig]:
     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):
+    if git_project_root and cfg_search_paths[0].resolve() != git_project_root.resolve():
         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[BaseConfig] = []
     for dir in cfg_search_paths:
         for filename in defaults.CONFIG_FILES:
-            out_path = dir / Path(filename)
-            if (
-                out_path.exists()
-                and not any(
-                    out_path.samefile(candidate.path) for candidate in candidates
-                )
-                and not (conf := _create_config_from_path(out_path)).is_empty_config
-            ):
-                candidates.append(conf)
+            out_path = dir / filename
+            if out_path.is_file():
+                conf = _create_config_from_path(out_path)
+                if conf.contains_commitizen_section():
+                    candidates.append(conf)
     return candidates
 
 
@@ -43,10 +37,10 @@ def _create_config_from_path(path: Path) -> BaseConfig:
 def read_cfg(filepath: str | None = None) -> BaseConfig:
     if filepath is not None:
         conf_path = Path(filepath)
-        if not conf_path.exists():
+        if not conf_path.is_file():
             raise ConfigFileNotFound()
         conf = _create_config_from_path(conf_path)
-        if conf.is_empty_config:
+        if not conf.contains_commitizen_section():
             raise ConfigFileIsEmpty()
         return conf
 

commitizen/config/base_config.py

@@ -17,10 +17,16 @@ if TYPE_CHECKING:
 
 class BaseConfig:
     def __init__(self) -> None:
-        self.is_empty_config = False
         self._settings: Settings = DEFAULT_SETTINGS.copy()
         self._path: Path | None = None
 
+    def contains_commitizen_section(self) -> bool:
+        """Check if the config file contains a commitizen section.
+
+        The implementation is different for each config file type.
+        """
+        raise NotImplementedError()
+
     @property
     def settings(self) -> Settings:
         return self._settings

commitizen/config/json_config.py

@@ -25,6 +25,11 @@ class JsonConfig(BaseConfig):
         self.path = path
         self._parse_setting(data)
 
+    def contains_commitizen_section(self) -> bool:
+        with self.path.open("rb") as json_file:
+            config_doc = json.load(json_file)
+        return config_doc.get("commitizen") is not None
+
     def init_empty_config_content(self) -> None:
         with smart_open(
             self.path, "a", encoding=self._settings["encoding"]
@@ -32,7 +37,7 @@ class JsonConfig(BaseConfig):
             json.dump({"commitizen": {}}, json_file)
 
     def set_key(self, key: str, value: object) -> Self:
-        with open(self.path, "rb") as f:
+        with self.path.open("rb") as f:
             config_doc = json.load(f)
 
         config_doc["commitizen"][key] = value
@@ -59,4 +64,4 @@ class JsonConfig(BaseConfig):
         try:
             self.settings.update(doc["commitizen"])
         except KeyError:
-            self.is_empty_config = True
+            pass

commitizen/config/toml_config.py

@@ -26,6 +26,11 @@ class TomlConfig(BaseConfig):
         self.path = path
         self._parse_setting(data)
 
+    def contains_commitizen_section(self) -> bool:
+        with self.path.open("rb") as f:
+            config_doc = parse(f.read())
+        return config_doc.get("tool", {}).get("commitizen") is not None
+
     def init_empty_config_content(self) -> None:
         config_doc = TOMLDocument()
         if os.path.isfile(self.path):
@@ -67,4 +72,4 @@ class TomlConfig(BaseConfig):
         try:
             self.settings.update(doc["tool"]["commitizen"])  # type: ignore[index,typeddict-item] # TODO: fix this
         except exceptions.NonExistentKey:
-            self.is_empty_config = True
+            pass

commitizen/config/yaml_config.py

@@ -32,6 +32,11 @@ class YAMLConfig(BaseConfig):
         ) as json_file:
             yaml.dump({"commitizen": {}}, json_file, explicit_start=True)
 
+    def contains_commitizen_section(self) -> bool:
+        with self.path.open("rb") as yaml_file:
+            config_doc = yaml.load(yaml_file, Loader=yaml.FullLoader)
+        return config_doc.get("commitizen") is not None
+
     def _parse_setting(self, data: bytes | str) -> None:
         """We expect to have a section in cz.yaml looking like
 
@@ -40,8 +45,6 @@ class YAMLConfig(BaseConfig):
           name: cz_conventional_commits
         ```
         """
-        import yaml.scanner
-
         try:
             doc = yaml.safe_load(data)
         except yaml.YAMLError as e:
@@ -50,7 +53,7 @@ class YAMLConfig(BaseConfig):
         try:
             self.settings.update(doc["commitizen"])
         except (KeyError, TypeError):
-            self.is_empty_config = True
+            pass
 
     def set_key(self, key: str, value: object) -> Self:
         with open(self.path, "rb") as yaml_file:

{commitizen-4.13.0.dist-info → commitizen-4.13.1.dist-info}/METADATA

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

{commitizen-4.13.0.dist-info → commitizen-4.13.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 commitizen/__init__.py,sha256=oOBG9f3DtTPmFnqXnwvuh1XIw9kqf_-cyrFYlRaZ1fQ,593
 commitizen/__main__.py,sha256=ythPim4R6rgC0zU9siklq1oSbkk2HlbiNpwwoegk8uE,71
-commitizen/__version__.py,sha256=9Eu48ft2G9OmRml3_rfORRbpYtNuauG7kRVNg5FgKGw,23
+commitizen/__version__.py,sha256=eI5KkHEFD5jz0OTYWOVaCxYxX1UbP8_xHAIvX8O5ugE,23
 commitizen/bump.py,sha256=-C09y5sAlVPyWTbEgqZimQMlz6LL248Ht2Pv90Ks6Dg,4692
 commitizen/changelog.py,sha256=ydaFUSHUBPpdNjw_yoPJ1_pr3AAr9rHS-NwP8gQDIUA,11278
 commitizen/changelog_formats/__init__.py,sha256=ZkxdmGybxWTzQZbt5KTJdAdbdKx0-v3aXtNDC-efRQk,3369
@@ -22,12 +22,12 @@ commitizen/commands/init.py,sha256=doLc-Y_o89S-64j-c7P4_ID0EiaAkhhe5veZpH8V8Ew,1
 commitizen/commands/list_cz.py,sha256=0eCGpRLn5v7XLNWiMkA14QN260fyR6gzoDvAM2mq-IM,349
 commitizen/commands/schema.py,sha256=66m_xCjAsUS7_a2Q_dx-CCiHJ6UXG8RJVUeLO_pl2gU,366
 commitizen/commands/version.py,sha256=X_Hrjb_48hBGTN3J8dD3_kveLvaPBlnQarw96Koag20,2868
-commitizen/config/__init__.py,sha256=Pl3FXXQcdb44SS8uZlRS4xq4fpgF0pxwZgBCYAdT458,2127
-commitizen/config/base_config.py,sha256=xfrPXpbOupDst8oxrOLGcGbeFRLyZZ8n-_uoMnyIkEM,1461
+commitizen/config/__init__.py,sha256=aMfdqszk20Rm9Y5W9G3ZE_FGA5d4tcKK2xdRSgtZ8sI,1806
+commitizen/config/base_config.py,sha256=mWb39DMd5J7yn2Nj-6ZFbUZeR4Tapr06KPvyMXRenhE,1659
 commitizen/config/factory.py,sha256=-6TcsKLGVJ1Tw1nkRVv5aAfS4JvxY6V2QLirNL8Ly8M,839
-commitizen/config/json_config.py,sha256=GS4HBXLFyWDiQhDgPrmrAmuPHY7fsPrFnaGepcImeso,1770
-commitizen/config/toml_config.py,sha256=NoIPKcHlRr8woabCohw5Hn3BnnLlclKjm9bG0ggk2nw,2213
-commitizen/config/yaml_config.py,sha256=FtgqVYpTBs0CJjTE9SpHLk3YCcj685zOcGOEUYQYBsk,1869
+commitizen/config/json_config.py,sha256=fyMFxZIvQcKNSJUa56kus9vhXQKoA5MTWl9FZY1KyvU,1948
+commitizen/config/toml_config.py,sha256=aoT6nsTSv2AEQdbKfqNOL7sj78hr9QESdX9BxHgipzY,2395
+commitizen/config/yaml_config.py,sha256=hmH0_DU-lpbtmFJU5cMirNt2WAr3oBuqkMAbIKy5oU8,2043
 commitizen/cz/__init__.py,sha256=45-VfzHalISUDcpkrfGLVvBRoTdAtdTf3-CmuOqBaus,1311
 commitizen/cz/base.py,sha256=w2VeKICv59VBgOxpRB8VaXN5LoJRop_P6mDDkrTsQe0,5540
 commitizen/cz/conventional_commits/__init__.py,sha256=GZHCs25rv1p1dp4BNczL5FU_pPdENazF8yso_Ca2sQQ,70
@@ -66,7 +66,7 @@ commitizen/templates/CHANGELOG.md.j2,sha256=MggRrhbL3EabwsH8v0oFMM8G296ATBzePaqu
 commitizen/templates/CHANGELOG.rst.j2,sha256=XHh4a7S83Z5Vrd_0UaLDA1Bb7A82Px4eHcbHsZGKYF8,515
 commitizen/templates/CHANGELOG.textile.j2,sha256=8JxCcDdgQUmNPxXFEv5IpbP_vcfvYCo5CSicNCZmFCY,404
 commitizen/version_schemes.py,sha256=NDyxMzJGK1NKkTgtJ4BNw_NgKxJhvK0EWWVhfqzzwHI,13460
-commitizen-4.13.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-commitizen-4.13.0.dist-info/entry_points.txt,sha256=EpbOUAABRQCFhf2HFcmrJZLGsbB_MSJ-tFua-NxUCxE,1085
-commitizen-4.13.0.dist-info/METADATA,sha256=_fGaLoWDOrZI5ioaVd-tv27GGufu47rbePPVqG26r2k,13532
-commitizen-4.13.0.dist-info/RECORD,,
+commitizen-4.13.1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+commitizen-4.13.1.dist-info/entry_points.txt,sha256=EpbOUAABRQCFhf2HFcmrJZLGsbB_MSJ-tFua-NxUCxE,1085
+commitizen-4.13.1.dist-info/METADATA,sha256=IGoTkaDPxQujlMdF_uMmma7zPK804jSqdYXkytflhCE,13532
+commitizen-4.13.1.dist-info/RECORD,,