conventional-pre-commit 3.3.0__tar.gz → 3.5.0__tar.gz

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ default_install_hook_types:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: mixed-line-ending
@@ -18,21 +18,21 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
         types:
           - python
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         types:
           - python
 
   - repo: https://github.com/pycqa/bandit
-    rev: 1.7.9
+    rev: 1.7.10
     hooks:
       - id: bandit
         args: ["-ll"]

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conventional_pre_commit
-Version: 3.3.0
+Version: 3.5.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.3.0 → conventional_pre_commit-3.5.0}/conventional_pre_commit/format.py

@@ -39,7 +39,10 @@ def r_scope(optional=True, scopes: Optional[List[str]] = None):
 
     if scopes:
         scopes_pattern = _get_scope_pattern(scopes)
-        return scopes_pattern
+        if optional:
+            return f"(?:{scopes_pattern})?"
+        else:
+            return scopes_pattern
 
     if optional:
         return r"(\([\w \/:,-]+\))?"
@@ -67,13 +70,14 @@ 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 r_verbose_commit_ignored():
+    """Regex str for the ignored part of verbose commit message templates"""
+    return r"^# -{24} >8 -{24}\r?\n.*\Z"
 
 
-def strip_verbose_diff(input):
-    return re.sub(r_verbose_diff(), "", input, flags=re.MULTILINE)
+def strip_verbose_commit_ignored(input):
+    """Strip the ignored part of verbose commit message templates."""
+    return re.sub(r_verbose_commit_ignored(), "", input, flags=re.DOTALL | re.MULTILINE)
 
 
 def r_comment():
@@ -99,7 +103,7 @@ def is_conventional(input, types=DEFAULT_TYPES, optional_scope=True, scopes: Opt
 
     Optionally provide a list of additional custom types.
     """
-    input = strip_verbose_diff(input)
+    input = strip_verbose_commit_ignored(input)
     input = strip_comments(input)
     types = conventional_types(types)
     pattern = f"^({r_types(types)}){r_scope(optional_scope, scopes=scopes)}{r_delim()}{r_subject()}{r_body()}"

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/conventional_pre_commit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conventional_pre_commit
-Version: 3.3.0
+Version: 3.5.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.3.0 → conventional_pre_commit-3.5.0}/tests/run.sh

@@ -7,5 +7,5 @@ coverage run -m pytest
 # clean out old coverage results
 rm -rf ./tests/coverage
 
-# regenerate coverate report
+# regenerate coverage report
 coverage html --directory ./tests/coverage

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/tests/test_format.py

@@ -66,7 +66,7 @@ def test_r_scope__special_chars():
 
 def test_r_scope__scopes():
     scopes_input = ["api", "client"]
-    result = format.r_scope(scopes=scopes_input)
+    result = format.r_scope(scopes=scopes_input, optional=False)
     regex = re.compile(result)
     assert regex.match("(api)")
     assert regex.match("(client)")
@@ -165,71 +165,275 @@ 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
+def test_r_verbose_commit_ignored__does_not_match_no_verbose():
+    regex = re.compile(format.r_verbose_commit_ignored(), re.DOTALL | re.MULTILINE)
+    input = """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
 """
 
-    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.search(input)
+
+
+def test_r_verbose_commit_ignored__matches_single_verbose_ignored():
+    regex = re.compile(format.r_verbose_commit_ignored(), re.DOTALL | re.MULTILINE)
+    input = (
+        """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+diff --git c/README.md i/README.md
+index ea80a93..fe8a527 100644
+--- c/README.md
++++ i/README.md
+@@ -20,3 +20,4 @@ Some hunk header
+ Context 1
 """
-
-    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
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Context 2
++Added line
 """
+    )
 
-    assert not regex.match(input)
-
-
-def test_strip_verbose_diff__has_diff():
-    input = """feat(scope): message
-# Please enter the commit message for your changes.
+    assert regex.search(input)
+
+
+def test_r_verbose_commit_ignored__matches_double_verbose_ignored():
+    regex = re.compile(format.r_verbose_commit_ignored(), re.DOTALL | re.MULTILINE)
+    input = (
+        """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+#
+# Changes to be committed:
+diff --git c/README.md i/README.md
+index ea80a93..fe8a527 100644
+--- c/README.md
++++ i/README.md
+@@ -20,3 +20,4 @@ Some staged hunk header
+ Staged Context 1
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Staged Context 2
++Staged added line
+# --------------------------------------------------
+# Changes not staged for commit:
+diff --git i/README.md w/README.md
+index fe8a527..1c00c14 100644
+--- i/README.md
++++ w/README.md
+@@ -10,6 +10,7 @@ Some unstaged hunk header
+ Context 1
+ Context 2
+ Context 3
+-Removed line
++Added line
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Context 4
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+"""
+    )
 
-# These are comments usually added by editors, f.ex. with export EDITOR=vim
-# ----------- >8 -----------
-# Some comment
-# Some comment
-diff --git a/file b/file
+    assert regex.search(input)
+
+
+def test_strip_verbose_commit_ignored__does_not_strip_no_verbose():
+    input = """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
 """
 
-    result = format.strip_verbose_diff(input)
-    assert result.count("\n") == 4
-    assert (
-        result
-        == """feat(scope): message
-# Please enter the commit message for your changes.
+    expected = """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+"""
 
-# These are comments usually added by editors, f.ex. with export EDITOR=vim
+    result = format.strip_verbose_commit_ignored(input)
+    assert result == expected
+
+
+def test_strip_verbose_commit_ignored__strips_single_verbose_ignored():
+    input = (
+        """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+diff --git c/README.md i/README.md
+index ea80a93..fe8a527 100644
+--- c/README.md
++++ i/README.md
+@@ -20,3 +20,4 @@ Some hunk header
+ Context 1
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Context 2
++Added line
 """
     )
 
+    expected = """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+"""
 
-def test_strip_verbose_diff__no_diff():
-    input = """feat(scope): message
-# Please enter the commit message for your changes.
+    result = format.strip_verbose_commit_ignored(input)
+    assert result == expected
+
+
+def test_strip_verbose_commit_ignored__strips_double_verbose_ignored():
+    input = (
+        """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+#
+# Changes to be committed:
+diff --git c/README.md i/README.md
+index ea80a93..fe8a527 100644
+--- c/README.md
++++ i/README.md
+@@ -20,3 +20,4 @@ Some staged hunk header
+ Staged Context 1
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Staged Context 2
++Staged added line
+# --------------------------------------------------
+# Changes not staged for commit:
+diff --git i/README.md w/README.md
+index fe8a527..1c00c14 100644
+--- i/README.md
++++ w/README.md
+@@ -10,6 +10,7 @@ Some unstaged hunk header
+ Context 1
+ Context 2
+ Context 3
+-Removed line
++Added line
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+ Context 4
+"""
+        + " "  # This is on purpose to preserve the space from overly eager stripping.
+        + """
+"""
+    )
 
-# These are comments usually added by editors, f.ex. with export EDITOR=vim
-# ----------- >8 -----------
-# Some comment
-# Some comment
+    expected = """feat: some commit message
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   README.md
+#
+# Changes not staged for commit:
+#	modified:   README.md
+#
 """
 
-    result = format.strip_verbose_diff(input)
-    assert result == input
+    result = format.strip_verbose_commit_ignored(input)
+    assert result == expected
 
 
 @pytest.mark.parametrize("type", format.DEFAULT_TYPES)

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/tests/test_hook.py

@@ -152,6 +152,36 @@ def test_subprocess_fail__conventional_with_multiple_scopes(cmd, conventional_co
     assert result == RESULT_FAIL
 
 
+def test_main_success__custom_scopes_optional_scope(conventional_commit_path):
+    result = main(["--scopes", "api,client", conventional_commit_path])
+    assert result == RESULT_SUCCESS
+
+
+def test_main_success__custom_scopes_with_allowed_scope(conventional_commit_with_multiple_scopes_path):
+    result = main(["--scopes", "chore,api,client", conventional_commit_with_multiple_scopes_path])
+    assert result == RESULT_SUCCESS
+
+
+def test_main_fail__custom_scopes_with_disallowed_scope(conventional_commit_with_scope_path):
+    result = main(["--scopes", "api,client", conventional_commit_with_scope_path])
+    assert result == RESULT_FAIL
+
+
+def test_main_fail__custom_scopes_require_scope_no_scope(conventional_commit_path):
+    result = main(["--scopes", "chore,feat,fix,custom", "--force-scope", conventional_commit_path])
+    assert result == RESULT_FAIL
+
+
+def test_main_success__custom_scopes_require_scope_with_allowed_scope(conventional_commit_with_scope_path):
+    result = main(["--scopes", "api,client,scope", "--force-scope", conventional_commit_with_scope_path])
+    assert result == RESULT_SUCCESS
+
+
+def test_main_fail__custom_scopes_require_scope_with_disallowed_scope(conventional_commit_with_scope_path):
+    result = main(["--scopes", "api,client", "--force-scope", conventional_commit_with_scope_path])
+    assert result == RESULT_FAIL
+
+
 def test_subprocess_success__fixup_commit(cmd, fixup_commit_path):
     result = subprocess.call((cmd, fixup_commit_path))
 

{conventional_pre_commit-3.3.0 → conventional_pre_commit-3.5.0}/.github/workflows/release.yml

@@ -36,16 +36,6 @@ jobs:
       - name: Build package
         run: python -m build
 
-      - name: Release
-        id: release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            ./dist/*.whl
-            ./dist/*.tar.gz
-          prerelease: ${{ contains(github.ref, '-pre') }}
-          generate_release_notes: ${{ !contains(github.ref, '-pre') }}
-
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         if: ${{ contains(github.ref, '-pre') }}
@@ -60,3 +50,13 @@ jobs:
         if: ${{ !contains(github.ref, '-pre') }}
         with:
           print-hash: true
+
+      - name: Release
+        id: release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ./dist/*.whl
+            ./dist/*.tar.gz
+          prerelease: ${{ contains(github.ref, '-pre') }}
+          generate_release_notes: ${{ !contains(github.ref, '-pre') }}