Merge branch 'main' into options_docs_2

Author: Rowlando13

.github/workflows/pre-commit.yaml

@@ -12,5 +12,5 @@ jobs:
       with:
         python-version: 3.x
     - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-    - uses: pre-commit-ci/lite-action@9d882e7a565f7008d4faf128f27d1cb6503d4ebf # v1.0.2
+    - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
       if: ${{ !cancelled() }}

.github/workflows/tests.yaml

@@ -42,7 +42,7 @@ jobs:
           cache: pip
           cache-dependency-path: requirements*/*.txt
       - name: cache mypy
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: ./.mypy_cache
           key: mypy|${{ hashFiles('pyproject.toml') }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.1
+    rev: v0.8.1
     hooks:
       - id: ruff
       - id: ruff-format

src/click/core.py

@@ -1028,7 +1028,7 @@ def get_help_option(self, ctx: Context) -> Option | None:
 
         # apply help_option decorator and pop resulting option
         help_option(*help_option_names)(self)
-        return self.params.pop() # type: ignore[return-value]
+        return self.params.pop()  # type: ignore[return-value]
 
     def make_parser(self, ctx: Context) -> _OptionParser:
         """Creates the underlying option parser for this command."""