Merge branch 'master' into updateCiGha

Author: clintonsteiner

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

.github/workflows/pypi.yml

@@ -9,13 +9,12 @@ on:
       - v*
 
 jobs:
-
   tox:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python: ['3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
@@ -40,7 +39,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.13
         cache: 'pip'
         cache-dependency-path: |
           '../**/requirements*.txt'
@@ -50,6 +49,6 @@ jobs:
     - name: Build package
       run: python setup.py sdist bdist_wheel
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@v1.5.0
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.pypi_password }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v5.0.0
     hooks:
     -   id: check-builtin-literals
         args: ['--no-allow-dict-kwargs']
@@ -11,10 +11,13 @@ repos:
     -   id: double-quote-string-fixer
     -   id: end-of-file-fixer
     -   id: name-tests-test
+    -   id: trailing-whitespace
+-   repo: https://github.com/PyCQA/flake8
+    rev: 7.1.1
+    hooks:
     -   id: flake8
         args: ['--max-line-length', '100']
         exclude: ^test_data/|bumpity.py$
-    -   id: trailing-whitespace
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v1.6.1
     hooks:
@@ -25,8 +28,8 @@ repos:
     rev: v1.4.1
     hooks:
     -   id: add-trailing-comma
--   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.4.4
+-   repo: https://github.com/hhatto/autopep8
+    rev: v2.3.1
     hooks:
     -   id: autopep8
 -   repo: local

detect_secrets/core/secrets_collection.py

@@ -308,6 +308,10 @@ def __sub__(self, other: Any) -> 'SecretsCollection':
 
         return output
 
+    def __len__(self) -> int:
+        """Returns the total number of secrets in the collection."""
+        return sum(len(secrets) for secrets in self.data.values())
+
 
 def _scan_file_and_serialize(filename: str) -> List[PotentialSecret]:
     """Used for multiprocessing, since lambdas can't be serialized."""

detect_secrets/pre_commit_hook.py

@@ -138,6 +138,9 @@ def pretty_print_diagnostics(secrets: SecretsCollection, width: int = 80) -> Non
     for _, secret in secrets:
         print(secret)
 
+    # Display the number of detected secrets
+    print(f'\nTotal secrets detected: {len(secrets)}')
+
     # Display mitigation suggestions
     print('Possible mitigations:')
     wrapper = textwrap.TextWrapper(

requirements-dev-minimal.txt

@@ -1,5 +1,5 @@
 coverage
-flake8==7.0.0
+flake8==7.1.1
 gibberish-detector>=0.1.1
 monotonic
 mypy

requirements-dev.txt

@@ -5,8 +5,8 @@ cfgv==3.4.0
 charset-normalizer==3.3.2
 coverage==7.5.3
 distlib==0.3.8
-filelock==3.14.0
-flake8==7.0.0
+filelock==3.16.1
+flake8==7.1.1
 gibberish-detector==0.1.1
 identify==2.5.36
 idna==3.7
@@ -17,12 +17,12 @@ mypy==0.971
 mypy-extensions==1.0.0
 nodeenv==1.9.1
 packaging==24.1
-platformdirs==4.2.2
+platformdirs==4.3.6
 pluggy==1.5.0
 pre-commit==4.0.1
 py==1.11.0
 pyahocorasick==2.1.0
-pycodestyle==2.11.1
+pycodestyle==2.12.1
 pyflakes==3.2.0
 pyparsing==3.1.2
 pytest==7.4.3
@@ -31,13 +31,12 @@ requests==2.32.3
 responses==0.25.3
 six==1.16.0
 toml==0.10.2
-tox==4.15.0
+tox==4.23.2
 tox-pip-extensions==1.6.0
-typed-ast==1.5.5
 types-PyYAML==6.0.12.12
 types-requests==2.31.0.20240106
 typing-extensions==4.12.2
 unidiff==0.7.5
 urllib3==2.2.2
-virtualenv==20.26.3
+virtualenv==20.26.6
 zipp==3.19.2

tests/pre_commit_hook_test.py

@@ -98,6 +98,7 @@ def test_console_output():
     # Assert formatting
     output = capturedOutput.getvalue()
     assert output.startswith('ERROR: Potential secrets about to be committed to git repo!')
+    assert 'Total secrets detected: 1' in output
 
 
 def test_console_output_json_formatting():

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 project = detect_secrets
 # These should match the ci python env list
-envlist = py{39,310,311,312},mypy
+envlist = py{39,310,311,312,313},mypy
 skip_missing_interpreters = true
 
 [testenv]