Merge branch 'main' into dependabot/github_actions/mikepenz/action-junit-report-6

Author: rcolfin

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ concurrency:
   cancel-in-progress: true
 
 permissions:
+  actions: write
   contents: read
   checks: write
   id-token: write
@@ -65,7 +66,7 @@ jobs:
 
       - name: Install uv
         id: setup-uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           version: latest
           python-version: ${{ matrix.python-version }}

.github/workflows/dependabotautomerge.yml

@@ -5,6 +5,7 @@ concurrency:
   cancel-in-progress: true
 
 permissions:
+  actions: write
   contents: write
   pull-requests: write
 

.github/workflows/docker-image.yml

@@ -1,6 +1,7 @@
 name: Publish Docker Image
 
 permissions:
+  actions: write
   contents: read
   checks: write
   id-token: write

.github/workflows/rebase-dependabot.yml

@@ -0,0 +1,54 @@
+name: Rebase Dependabot
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  rebase-dependabot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Rebase Dependabot open PRs
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            // list open PRs
+            const { data: prs } = await github.rest.pulls.list({
+              owner, repo, state: "open", per_page: 100
+            });
+
+            for (const pr of prs) {
+              if (!pr.head.ref) {
+                continue;
+              }
+
+              // target dependabot PRs
+              const isDependabot = pr.user && (
+                 pr.user.login === "dependabot[bot]" ||
+                 (pr.user.login.endsWith("[bot]") && pr.head.ref.startsWith("dependabot/"))
+              );
+              if (!isDependabot) continue;
+
+              try {
+                await github.rest.pulls.updateBranch({
+                  owner,
+                  repo,
+                  pull_number: pr.number
+                });
+                core.info(`Requested update for PR #${pr.number}`);
+              } catch (err) {
+                core.warning(`Failed to update PR #${pr.number}: ${err.message}`);
+              }
+            }

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
 
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.1
+    rev: v0.14.6
     hooks:
       # Linter
       - id: ruff
@@ -38,7 +38,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.8.1
+    rev: 0.8.2
     hooks:
       - id: nbstripout
 

dask-test/uv.lock

@@ -5,10 +5,15 @@
 from typing import TYPE_CHECKING, Any
 
 import anyio
-import backoff
 import requests
 from docker.client import DockerClient
 from tabulate import tabulate
+from tenacity import (
+    retry,
+    retry_if_exception,
+    stop_after_attempt,
+    wait_exponential,
+)
 
 from docker_health_check import __version__, constants, utils
 from docker_health_check.models import ContainerRow
@@ -34,7 +39,11 @@ async def _restart(state: tuple[ContainerRow, NotificationHub]) -> None:
         notification_hub.enqueue(message)
 
 
-@backoff.on_exception(backoff.expo, requests.exceptions.RequestException, max_tries=constants.MAX_RETRY)
+@retry(
+    retry=retry_if_exception(lambda ex: isinstance(ex, requests.exceptions.RequestException)),
+    wait=wait_exponential(),
+    stop=stop_after_attempt(constants.MAX_RETRY),
+)
 def _get_containers(client: DockerClient, filters: dict[str, Any] | None) -> Iterable[ContainerRow]:
     containers = client.containers.list(filters=filters)
     return map(ContainerRow.from_container, containers)

docker-health-check/docker_health_check/api/healthcheck.py

@@ -27,7 +27,7 @@ dependencies = [
     "tabulate<1.0.0,>=0.9.0",
     "pydantic<3.0.0,>=2.9.2",
     "pydantic-settings<3.0.0,>=2.6.0",
-    "backoff<3.0.0,>=2.2.1",
+    "tenacity>=9.1.2",
 ]
 
 [dependency-groups]

docker-health-check/pyproject.toml

@@ -6,8 +6,14 @@
 from http import HTTPMethod, HTTPStatus
 from typing import TYPE_CHECKING, Any, Final, Self, cast
 
-import backoff
 from curl_cffi import requests
+from tenacity import (
+    retry,
+    retry_if_exception,
+    stop_after_attempt,
+    stop_after_delay,
+    wait_exponential,
+)
 
 from github import constants
 
@@ -68,11 +74,10 @@ async def _execute(
         async with self._make_request(method, url, headers, params=params) as response:
             assert response.status_code == HTTPStatus.NO_CONTENT
 
-    @backoff.on_exception(
-        backoff.expo,
-        requests.exceptions.RequestException,
-        max_tries=constants.MAX_RETRIES,
-        max_time=constants.MAX_RETRY_TIME,
+    @retry(
+        retry=retry_if_exception(lambda ex: isinstance(ex, requests.exceptions.RequestException)),
+        wait=wait_exponential(),
+        stop=stop_after_attempt(constants.MAX_RETRIES) | stop_after_delay(constants.MAX_RETRY_TIME),
     )
     @asynccontextmanager
     async def _make_request(