Merge branch 'main' into log-format

Author: aguinane

.github/workflows/ci.yaml

@@ -14,32 +14,32 @@ concurrency:
 jobs:
   test:
     timeout-minutes: 20
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
-          - python: "3.8"
-            tox: py38
           - python: "3.9"
             tox: py39
           - python: "3.10"
             tox: py310
           - python: "3.11"
             tox: py311
           - python: "3.12"
-            tox: py312,py312-trio
+            tox: py312
           - python: "3.12"
             tox: pep8
+          - python: "3.13"
+            tox: py313,py313-trio
           - python: "3.11"
             tox: mypy
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
 
       - name: Setup Python 🔧
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true

.github/workflows/deploy.yaml

@@ -0,0 +1,34 @@
+name: upload release to PyPI
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  pypi-publish:
+    name: upload release to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - uses: actions/setup-python@v5.5.0
+        with:
+          python-version: 3.13
+
+      - name: Install build
+        run: |
+          pip install setuptools-scm wheel
+
+      - name: Build
+        run: |
+          python setup.py sdist bdist_wheel
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/release.yml

@@ -10,11 +10,11 @@ queue_rules:
         - files ~= ^releasenotes/notes/
         - label = no-changelog
         - author = dependabot[bot]
-      - "check-success=test (3.8, py38)"
       - "check-success=test (3.9, py39)"
       - "check-success=test (3.10, py310)"
       - "check-success=test (3.11, py311)"
-      - "check-success=test (3.12, py312,py312-trio)"
+      - "check-success=test (3.12, py312)"
+      - "check-success=test (3.13, py313,py313-trio)"
       - "check-success=test (3.12, pep8)"
 
 pull_request_rules:

.mergify.yml

@@ -11,7 +11,7 @@ build-backend="setuptools.build_meta"
 [tool.ruff]
 line-length = 88
 indent-width = 4
-target-version = "py38"
+target-version = "py39"
 
 [tool.mypy]
 strict = true

pyproject.toml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Added `re.Pattern` to allowed match types.

releasenotes/notes/add-re-pattern-to-match-types-6a4c1d9e64e2a5e1.yaml

@@ -13,16 +13,16 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     Topic :: Utilities
 
 [options]
 install_requires =
-python_requires = >=3.8
+python_requires = >=3.9
 packages = find:
 
 [options.packages.find]

setup.cfg

@@ -76,7 +76,7 @@
 from .after import after_log  # noqa
 from .after import after_nothing  # noqa
 
-# Import all built-in after strategies for easier usage.
+# Import all built-in before sleep strategies for easier usage.
 from .before_sleep import before_sleep_log  # noqa
 from .before_sleep import before_sleep_nothing  # noqa
 
@@ -88,6 +88,8 @@
 if t.TYPE_CHECKING:
     import types
 
+    from typing_extensions import Self
+
     from . import asyncio as tasyncio
     from .retry import RetryBaseT
     from .stop import StopBaseT
@@ -255,7 +257,7 @@ def copy(
         retry_error_callback: t.Union[
             t.Optional[t.Callable[["RetryCallState"], t.Any]], object
         ] = _unset,
-    ) -> "BaseRetrying":
+    ) -> "Self":
         """Copy this object with some parameters changed if needed."""
         return self.__class__(
             sleep=_first_set(sleep, self.sleep),

tenacity/__init__.py

@@ -25,7 +25,7 @@
 
 
 def before_sleep_nothing(retry_state: "RetryCallState") -> None:
-    """Before call strategy that does nothing."""
+    """Before sleep strategy that does nothing."""
 
 
 def before_sleep_log(
@@ -34,7 +34,7 @@ def before_sleep_log(
     exc_info: bool = False,
     sec_format: str = "%.3g",
 ) -> typing.Callable[["RetryCallState"], None]:
-    """Before call strategy that logs to some logger the attempt."""
+    """Before sleep strategy that logs to some logger the attempt."""
 
     def log_it(retry_state: "RetryCallState") -> None:
         local_exc_info: BaseException | bool | None

tenacity/before_sleep.py

@@ -207,7 +207,7 @@ class retry_if_exception_message(retry_if_exception):
     def __init__(
         self,
         message: typing.Optional[str] = None,
-        match: typing.Optional[str] = None,
+        match: typing.Union[None, str, typing.Pattern[str]] = None,
     ) -> None:
         if message and match:
             raise TypeError(
@@ -242,7 +242,7 @@ class retry_if_not_exception_message(retry_if_exception_message):
     def __init__(
         self,
         message: typing.Optional[str] = None,
-        match: typing.Optional[str] = None,
+        match: typing.Union[None, str, typing.Pattern[str]] = None,
     ) -> None:
         super().__init__(message, match)
         # invert predicate