Merge branch 'main' into pytest-asyncio-1.0

Author: edgarrmondragon

.github/workflows/ci.yaml

@@ -21,19 +21,23 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    name: Python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-24.04]
         python-version:
-        - "3.7"
         - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
         - "3.13"
         - "3.14"
+        include:
+        - os: ubuntu-22.04
+          python-version: "3.7"
     steps:
       - name: Checkout code
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

backoff/_async.py

@@ -2,13 +2,14 @@
 import datetime
 import functools
 import asyncio
+import inspect
 from datetime import timedelta
 
 from backoff._common import (_init_wait_gen, _maybe_call, _next_wait)
 
 
 def _ensure_coroutine(coro_or_func):
-    if asyncio.iscoroutinefunction(coro_or_func):
+    if inspect.iscoroutinefunction(coro_or_func):
         return coro_or_func
     else:
         @functools.wraps(coro_or_func)
@@ -47,10 +48,10 @@ def retry_predicate(target, wait_gen, predicate,
     on_giveup = _ensure_coroutines(on_giveup)
 
     # Easy to implement, please report if you need this.
-    assert not asyncio.iscoroutinefunction(max_tries)
-    assert not asyncio.iscoroutinefunction(jitter)
+    assert not inspect.iscoroutinefunction(max_tries)
+    assert not inspect.iscoroutinefunction(jitter)
 
-    assert asyncio.iscoroutinefunction(target)
+    assert inspect.iscoroutinefunction(target)
 
     @functools.wraps(target)
     async def retry(*args, **kwargs):
@@ -124,8 +125,8 @@ def retry_exception(target, wait_gen, exception,
     giveup = _ensure_coroutine(giveup)
 
     # Easy to implement, please report if you need this.
-    assert not asyncio.iscoroutinefunction(max_tries)
-    assert not asyncio.iscoroutinefunction(jitter)
+    assert not inspect.iscoroutinefunction(max_tries)
+    assert not inspect.iscoroutinefunction(jitter)
 
     @functools.wraps(target)
     async def retry(*args, **kwargs):

backoff/_decorator.py

@@ -1,5 +1,5 @@
 # coding:utf-8
-import asyncio
+import inspect
 import logging
 import operator
 from typing import Any, Callable, Iterable, Optional, Type, Union
@@ -98,7 +98,7 @@ def decorate(target):
             log_level=giveup_log_level
         )
 
-        if asyncio.iscoroutinefunction(target):
+        if inspect.iscoroutinefunction(target):
             retry = _async.retry_predicate
         else:
             retry = _sync.retry_predicate
@@ -198,7 +198,7 @@ def decorate(target):
             log_level=giveup_log_level,
         )
 
-        if asyncio.iscoroutinefunction(target):
+        if inspect.iscoroutinefunction(target):
             retry = _async.retry_exception
         else:
             retry = _sync.retry_exception