conventional-pre-commit 3.1.0__tar.gz → 3.2.0__tar.gz

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Release
         id: release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             ./dist/*.whl

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.3.0
     hooks:
       - id: black
         types:
@@ -32,7 +32,7 @@ repos:
           - python
 
   - repo: https://github.com/pycqa/bandit
-    rev: 1.7.6
+    rev: 1.7.8
     hooks:
       - id: bandit
         args: ["-ll"]

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conventional_pre_commit
-Version: 3.1.0
+Version: 3.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

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/conventional_pre_commit/format.py

@@ -54,6 +54,15 @@ def r_autosquash_prefixes():
     return "|".join(AUTOSQUASH_PREFIXES)
 
 
+def r_verbose_diff():
+    """Regex str for verbose diff"""
+    return r"(?P<diff>(^# -* >8 -*$\r?\n)(^# .*$\r?\n)+(diff ){1}(.*\r?\n)*)"
+
+
+def strip_verbose_diff(input):
+    return re.sub(r_verbose_diff(), "", input, flags=re.MULTILINE)
+
+
 def r_comment():
     """Regex str for comment"""
     return r"^#.*\r?\n?"
@@ -77,6 +86,7 @@ def is_conventional(input, types=DEFAULT_TYPES, optional_scope=True):
 
     Optionally provide a list of additional custom types.
     """
+    input = strip_verbose_diff(input)
     input = strip_comments(input)
     types = conventional_types(types)
     pattern = f"^({r_types(types)}){r_scope(optional_scope)}{r_delim()}{r_subject()}{r_body()}"

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/conventional_pre_commit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conventional_pre_commit
-Version: 3.1.0
+Version: 3.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

{conventional_pre_commit-3.1.0 → conventional_pre_commit-3.2.0}/tests/test_format.py

@@ -151,6 +151,73 @@ def test_strip_comments__spaced():
     assert result.strip() == "feat(scope): message"
 
 
+def test_r_verbose_diff__has_diff():
+    regex = re.compile(format.r_verbose_diff(), re.MULTILINE)
+    input = """# ----------- >8 -----------
+# Some comment
+# Some comment
+diff --git a/file b/file
+"""
+
+    assert regex.match(input)
+
+
+def test_r_verbose_diff__no_diff():
+    regex = re.compile(format.r_verbose_diff(), re.MULTILINE)
+    input = """# ----------- >8 -----------
+# Some comment
+# Some comment
+"""
+
+    assert not regex.match(input)
+
+
+def test_r_verbose_diff__no_extra_comments():
+    regex = re.compile(format.r_verbose_diff(), re.MULTILINE)
+    input = """# ----------- >8 -----------
+diff --git a/file b/file
+"""
+
+    assert not regex.match(input)
+
+
+def test_strip_verbose_diff__has_diff():
+    input = """feat(scope): message
+# Please enter the commit message for your changes.
+
+# These are comments usually added by editors, f.ex. with export EDITOR=vim
+# ----------- >8 -----------
+# Some comment
+# Some comment
+diff --git a/file b/file
+"""
+
+    result = format.strip_verbose_diff(input)
+    assert result.count("\n") == 4
+    assert (
+        result
+        == """feat(scope): message
+# Please enter the commit message for your changes.
+
+# These are comments usually added by editors, f.ex. with export EDITOR=vim
+"""
+    )
+
+
+def test_strip_verbose_diff__no_diff():
+    input = """feat(scope): message
+# Please enter the commit message for your changes.
+
+# These are comments usually added by editors, f.ex. with export EDITOR=vim
+# ----------- >8 -----------
+# Some comment
+# Some comment
+"""
+
+    result = format.strip_verbose_diff(input)
+    assert result == input
+
+
 @pytest.mark.parametrize("type", format.DEFAULT_TYPES)
 def test_is_conventional__default_type(type):
     input = f"{type}: message"