conventional-pre-commit 4.0.0__tar.gz → 4.2.0__tar.gz

{conventional_pre_commit-4.0.0 → conventional_pre_commit-4.2.0}/.pre-commit-config.yaml

@@ -18,21 +18,21 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
         types:
           - python
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         types:
           - python
 
   - repo: https://github.com/pycqa/bandit
-    rev: 1.8.0
+    rev: 1.8.3
     hooks:
       - id: bandit
         args: ["-ll"]

{conventional_pre_commit-4.0.0 → conventional_pre_commit-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: conventional_pre_commit
-Version: 4.0.0
+Version: 4.2.0
 Summary: A pre-commit hook that checks commit messages for Conventional Commits formatting.
 Author-email: Compiler LLC <dev@compiler.la>
 License:                                  Apache License
@@ -220,6 +220,7 @@ Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: setuptools_scm; extra == "dev"
+Dynamic: license-file
 
 # conventional-pre-commit
 

{conventional_pre_commit-4.0.0 → conventional_pre_commit-4.2.0}/conventional_pre_commit/format.py

@@ -70,11 +70,16 @@ class Commit:
 
     def is_merge(self, commit_msg: str = ""):
         """
-        Returns True if input starts with "Merge branch"
-        See the documentation, please https://git-scm.com/docs/git-merge.
+        Returns True if the commit message indicates a merge commit.
+        Matches messages that start with "Merge", including:
+        - Merge branch ...
+        - Merge pull request ...
+        - Merge remote-tracking branch ...
+        - Merge tag ...
+        See https://git-scm.com/docs/git-merge.
         """
         commit_msg = self.clean(commit_msg)
-        return commit_msg.lower().startswith("merge branch ")
+        return bool(re.match(r"^merge\b", commit_msg.lower()))
 
 
 class ConventionalCommit(Commit):
@@ -116,7 +121,7 @@ class ConventionalCommit(Commit):
     @property
     def r_types(self):
         """Regex str for valid types."""
-        return self._r_or(self.types)
+        return f"(?i:{self._r_or(self.types)})"
 
     @property
     def r_scope(self):
@@ -125,7 +130,7 @@ class ConventionalCommit(Commit):
             scopes = self._r_or(self.scopes)
             escaped_delimiters = list(map(re.escape, [":", ",", "-", "/"]))  # type: ignore
             delimiters_pattern = self._r_or(escaped_delimiters)
-            scope_pattern = rf"\(\s*(?:{scopes})(?:\s*(?:{delimiters_pattern})\s*(?:{scopes}))*\s*\)"
+            scope_pattern = rf"\(\s*(?:(?i:{scopes}))(?:\s*(?:{delimiters_pattern})\s*(?:(?i:{scopes})))*\s*\)"
 
             if self.scope_optional:
                 return f"(?:{scope_pattern})?"

{conventional_pre_commit-4.0.0 → conventional_pre_commit-4.2.0}/conventional_pre_commit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: conventional_pre_commit
-Version: 4.0.0
+Version: 4.2.0
 Summary: A pre-commit hook that checks commit messages for Conventional Commits formatting.
 Author-email: Compiler LLC <dev@compiler.la>
 License:                                  Apache License
@@ -220,6 +220,7 @@ Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: setuptools_scm; extra == "dev"
+Dynamic: license-file
 
 # conventional-pre-commit
 

{conventional_pre_commit-4.0.0 → conventional_pre_commit-4.2.0}/tests/test_format.py

@@ -397,8 +397,16 @@ def test_has_autosquash_prefix(commit, input, expected_result):
     [
         ("Merge branch '2.x.x' into '1.x.x'", True),
         ("merge branch 'dev' into 'main'", True),
+        ("Merge remote-tracking branch 'origin/master'", True),
+        ("Merge pull request #123 from user/feature-branch", True),
+        ("Merge tag 'v1.2.3' into main", True),
+        ("Merge origin/master into develop", True),
+        ("Merge refs/heads/main into develop", True),
         ("nope not a merge commit", False),
         ("type: subject", False),
+        ("fix: merge bug in auth logic", False),
+        ("chore: merged upstream changes", False),
+        ("MergeSort implemented and tested", False),
     ],
 )
 def test_is_merge_commit(input, expected_result):
@@ -451,6 +459,20 @@ def test_r_scope__scopes(conventional_commit_scope_required):
     assert not regex.match("(api; client)")
 
 
+def test_r_scope__scopes_uppercase(conventional_commit_scope_required):
+    conventional_commit_scope_required.scopes = ["api", "client"]
+    regex = re.compile(conventional_commit_scope_required.r_scope)
+
+    assert regex.match("(API)")
+    assert regex.match("(CLIENT)")
+    assert regex.match("(API, CLIENT)")
+    assert regex.match("(API: CLIENT)")
+    assert regex.match("(API/CLIENT)")
+    assert regex.match("(API-CLIENT)")
+    assert not regex.match("(TEST)")
+    assert not regex.match("(API; CLIENT)")
+
+
 def test_r_delim(conventional_commit):
     regex = re.compile(conventional_commit.r_delim)
 
@@ -557,6 +579,13 @@ def test_is_valid__default_type(conventional_commit, type):
     assert conventional_commit.is_valid(input)
 
 
+@pytest.mark.parametrize("type", ConventionalCommit.DEFAULT_TYPES)
+def test_is_valid__default_type_uppercase(conventional_commit, type):
+    input = f"{type.upper()}: message"
+
+    assert conventional_commit.is_valid(input)
+
+
 @pytest.mark.parametrize("type", ConventionalCommit.CONVENTIONAL_TYPES)
 def test_is_valid__conventional_type(conventional_commit, type):
     input = f"{type}: message"
@@ -564,6 +593,13 @@ def test_is_valid__conventional_type(conventional_commit, type):
     assert conventional_commit.is_valid(input)
 
 
+@pytest.mark.parametrize("type", ConventionalCommit.CONVENTIONAL_TYPES)
+def test_is_valid__conventional_type_uppercase(conventional_commit, type):
+    input = f"{type.upper()}: message"
+
+    assert conventional_commit.is_valid(input)
+
+
 @pytest.mark.parametrize("type", CUSTOM_TYPES)
 def test_is_valid__custom_type(type):
     input = f"{type}: message"
@@ -580,6 +616,14 @@ def test_is_valid__conventional_custom_type(type):
     assert conventional_commits.is_valid(input)
 
 
+@pytest.mark.parametrize("type", ConventionalCommit.CONVENTIONAL_TYPES)
+def test_is_valid__conventional_custom_type_uppercase(type):
+    input = f"{type.upper()}: message"
+    conventional_commits = ConventionalCommit(types=CUSTOM_TYPES)
+
+    assert conventional_commits.is_valid(input)
+
+
 def test_is_valid__breaking_change(conventional_commit):
     input = "fix!: message"