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

{conventional_pre_commit-3.4.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.4.0 → conventional_pre_commit-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conventional_pre_commit
-Version: 3.4.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.4.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 \/:,-]+\))?"

{conventional_pre_commit-3.4.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.4.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.4.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)")

{conventional_pre_commit-3.4.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.4.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') }}