Merge branch 'develop' into pr-408

Author: zhPavel

.github/dependabot.yml

@@ -5,3 +5,5 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: develop
+    cooldown:
+      default-days: 28

.github/workflows/coverage_external_pr.yml

@@ -18,7 +18,7 @@ jobs:
       # DO NOT run actions/checkout here, for security reasons
       # For details, refer to https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
       - name: Post comment
-        uses: py-cov-action/python-coverage-comment-action@91910686861e4e1d8282a267a896eb39d46240fb
+        uses: py-cov-action/python-coverage-comment-action@7188638f871f721a365d644f505d1ff3df20d683
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_PR_RUN_ID: ${{ github.event.workflow_run.id }}

.github/workflows/lint_and_test.yml

@@ -23,12 +23,12 @@ jobs:
     timeout-minutes: 3
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
         with:
           python-version: "3.11"
 
@@ -56,24 +56,24 @@ jobs:
       fail-fast: true
       matrix:
         python_version:
-          - { setup: '3.9',      tox: 'py39',    cov: true  }
           - { setup: '3.10',     tox: 'py310',   cov: true  }
           - { setup: '3.11',     tox: 'py311',   cov: true  }
           - { setup: '3.12.3',   tox: 'py312',   cov: true  }  # (1)
           - { setup: '3.13',     tox: 'py313',   cov: true  }
-          - { setup: 'pypy3.9',  tox: 'pypy39',  cov: false }
+          - { setup: '3.14',     tox: 'py314',   cov: true  }
           - { setup: 'pypy3.10', tox: 'pypy310', cov: false }
+          - { setup: 'pypy3.11', tox: 'pypy311', cov: false }
 
         # (1): 3.12.4 contains backwards-incompatible changes of ForwardRef._evaluate()
         os: ['ubuntu-latest']
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
         with:
           python-version: ${{ matrix.python_version.setup }}
 
@@ -96,7 +96,7 @@ jobs:
             --cov-output .coverage.${{ matrix.python_version.tox }}
 
       - name: Store coverage file
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         if: ${{  (matrix.python_version.cov && github.event_name == 'pull_request') }}
         with:
           name: coverage-${{ matrix.python_version.tox }}
@@ -120,26 +120,26 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
+      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
         id: download
         with:
           pattern: coverage-*
           merge-multiple: true
 
       - name: Coverage comment
         id: coverage_comment
-        uses: py-cov-action/python-coverage-comment-action@91910686861e4e1d8282a267a896eb39d46240fb
+        uses: py-cov-action/python-coverage-comment-action@7188638f871f721a365d644f505d1ff3df20d683
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MERGE_COVERAGE_FILES: true
           MINIMUM_GREEN: 90
 
       - name: Store Pull Request comment to be posted (for external pr)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         if: steps.coverage_comment.outputs.COMMENT_FILE_WRITTEN == 'true'
         with:
           name: python-coverage-comment-action

.github/workflows/test_all_oses.yml

@@ -33,12 +33,12 @@ jobs:
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
           persist-credentials: false
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
         with:
           python-version: ${{ matrix.python_version.setup }}
 

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ default_stages:
 
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
@@ -35,30 +35,24 @@ repos:
         args: ['-e']  # remove default --in-place argument and emit error
 
   - repo: 'https://github.com/astral-sh/ruff-pre-commit'
-    rev: v0.11.10
+    rev: v0.14.14
     hooks:
       - id: ruff
         args: ['--fix-only']
 
-  - repo: 'https://github.com/pycqa/isort'
-    rev: 6.0.0
-    hooks:
-      - id: isort
-        args: ['--resolve-all-configs']
-
   - repo: 'https://github.com/python-jsonschema/check-jsonschema'
-    rev: 0.33.0
+    rev: 0.36.1
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
 
   - repo: 'https://github.com/rhysd/actionlint'
-    rev: v1.7.7
+    rev: v1.7.10
     hooks:
       - id: actionlint
 
   - repo: 'https://github.com/woodruffw/zizmor-pre-commit'
-    rev: v1.8.0
+    rev: v1.22.0
     hooks:
       - id: zizmor
 

_typos.toml

@@ -0,0 +1,12 @@
+[files]
+extend-exclude = [
+  "docs/_static/",
+  "*.json",
+  "*.svg",
+]
+
+[default.extend-words]
+# For line: `password_hash": "ZghOT0eRm4U9s"`
+ot = "ot"
+# For line: `FooBA = namedtuple("FooBA", "b a")`
+ba = "ba"

benchmarks/benchmarks/bench_nexus.py

@@ -9,16 +9,16 @@
 from concurrent.futures import Executor, ThreadPoolExecutor
 from dataclasses import dataclass
 from functools import partial
+from itertools import pairwise
 from pathlib import Path
 from textwrap import dedent
-from typing import Any, Callable, DefaultDict, Dict, Iterable, List, Mapping, Optional, Sequence, Set, TypeVar, Union
+from typing import Any, Callable, DefaultDict, Dict, Iterable, List, Mapping, Sequence, Set, TypeVar
 from zipfile import ZIP_BZIP2, ZipFile
 
 import plotly
 import plotly.graph_objects as go
 import pyperf
 
-from adaptix._internal.utils import pairs
 from benchmarks.pybench.director_api import BenchAccessor, BenchChecker, BenchmarkDirector, BenchStorageFactory
 
 T = TypeVar("T")
@@ -39,7 +39,7 @@ class BenchmarkMeasure:
     pyperf: pyperf.Benchmark
 
 
-def pyperf_bench_to_measure(data: Union[str, bytes]) -> BenchmarkMeasure:
+def pyperf_bench_to_measure(data: str | bytes) -> BenchmarkMeasure:
     pybench_data = json.loads(data)["pybench_data"]
     return BenchmarkMeasure(
         base=pybench_data["base"],
@@ -135,7 +135,7 @@ def __init__(self, last_cluster_idx: int, boundary_rate: float):
     def _split_into_clusters(self, measures: Iterable[BenchmarkMeasure]) -> Sequence[Sequence[BenchmarkMeasure]]:
         clusters: List[List[BenchmarkMeasure]] = []
         current_cluster: List[BenchmarkMeasure] = []
-        for prev, current in pairs(measures):
+        for prev, current in pairwise(measures):
             if current.pyperf.mean() / prev.pyperf.mean() >= self.boundary_rate:
                 clusters.append(current_cluster)
                 current_cluster = [current]
@@ -243,10 +243,10 @@ def add_arguments(cls, parser: ArgumentParser) -> None:
     def __init__(
         self,
         namespace: Namespace,
-        include: Optional[Sequence[str]] = None,
-        exclude: Optional[Sequence[str]] = None,
-        env_include: Optional[Sequence[str]] = None,
-        env_exclude: Optional[Sequence[str]] = None,
+        include: Sequence[str] | None = None,
+        exclude: Sequence[str] | None = None,
+        env_include: Sequence[str] | None = None,
+        env_exclude: Sequence[str] | None = None,
     ):
         self.include = include
         self.exclude = exclude
@@ -328,7 +328,7 @@ def load_directors(
                     env_description: self._submit_python(executor, env_description, env_spec_printer)
                     for env_description in self.filtered_envs()
                 }
-                for hub_description, env_spec_printer in zip(hub_descriptions, env_spec_printers)
+                for hub_description, env_spec_printer in zip(hub_descriptions, env_spec_printers, strict=False)
             }
             return {
                 hub_description: {
@@ -354,7 +354,7 @@ class CaseState:
     accessor: BenchAccessor
     checker: BenchChecker
     local_ids_with_warnings: Sequence[str]
-    max_tries: Optional[int]
+    max_tries: int | None
     tries_count: int = 0
 
     @property
@@ -388,12 +388,12 @@ def add_arguments(cls, parser: ArgumentParser) -> None:
     def __init__(
         self,
         namespace: Namespace,
-        include: Optional[Sequence[str]] = None,
-        exclude: Optional[Sequence[str]] = None,
-        env_include: Optional[Sequence[str]] = None,
-        env_exclude: Optional[Sequence[str]] = None,
+        include: Sequence[str] | None = None,
+        exclude: Sequence[str] | None = None,
+        env_include: Sequence[str] | None = None,
+        env_exclude: Sequence[str] | None = None,
         series: int = 2,
-        max_tries: Optional[int] = None,
+        max_tries: int | None = None,
     ):
         super().__init__(
             namespace=namespace,
@@ -551,11 +551,11 @@ def add_arguments(cls, parser: ArgumentParser) -> None:
     def __init__(
         self,
         namespace: Namespace,
-        include: Optional[Sequence[str]] = None,
-        exclude: Optional[Sequence[str]] = None,
-        env_include: Optional[Sequence[str]] = None,
-        env_exclude: Optional[Sequence[str]] = None,
-        output: Optional[str] = None,
+        include: Sequence[str] | None = None,
+        exclude: Sequence[str] | None = None,
+        env_include: Sequence[str] | None = None,
+        env_exclude: Sequence[str] | None = None,
+        output: str | None = None,
     ):
         super().__init__(
             namespace=namespace,

benchmarks/benchmarks/gh_issues/bench_adaptix.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Optional
+from typing import List
 
 from adaptix import DebugTrail, Retort, name_mapping
 from benchmarks.gh_issues.common import (
@@ -19,7 +19,7 @@ class SimpleUser:
     id: int
     node_id: str
     avatar_url: str
-    gravatar_id: Optional[str]
+    gravatar_id: str | None
     url: str
     html_url: str
     followers_url: str
@@ -33,9 +33,9 @@ class SimpleUser:
     received_events_url: str
     type: str
     site_admin: bool
-    name: Optional[str] = None
-    email: Optional[str] = None
-    starred_at: Optional[datetime] = None
+    name: str | None = None
+    email: str | None = None
+    starred_at: datetime | None = None
 
 
 @dataclass
@@ -44,7 +44,7 @@ class Label:
     node_id: str
     url: str
     name: str
-    description: Optional[str]
+    description: str | None
     color: str
     default: bool
 
@@ -65,11 +65,11 @@ class Reactions:
 
 @dataclass
 class PullRequest:
-    diff_url: Optional[str]
-    html_url: Optional[str]
-    patch_url: Optional[str]
-    url: Optional[str]
-    merged_at: Optional[datetime] = None
+    diff_url: str | None
+    html_url: str | None
+    patch_url: str | None
+    url: str | None
+    merged_at: datetime | None = None
 
 
 @dataclass
@@ -84,25 +84,25 @@ class Issue:
     html_url: str
     number: int
     state: IssueState
-    state_reason: Optional[StateReason]
+    state_reason: StateReason | None
     title: str
-    user: Optional[SimpleUser]
+    user: SimpleUser | None
     labels: List[Label]
-    assignee: Optional[SimpleUser]
-    assignees: Optional[List[SimpleUser]]
+    assignee: SimpleUser | None
+    assignees: List[SimpleUser] | None
     locked: bool
-    active_lock_reason: Optional[str]
+    active_lock_reason: str | None
     comments: int
-    closed_at: Optional[datetime]
-    created_at: Optional[datetime]
-    updated_at: Optional[datetime]
+    closed_at: datetime | None
+    created_at: datetime | None
+    updated_at: datetime | None
     author_association: AuthorAssociation
-    reactions: Optional[Reactions] = None
-    pull_request: Optional[PullRequest] = None
-    body_html: Optional[str] = None
-    body_text: Optional[str] = None
-    timeline_url: Optional[str] = None
-    body: Optional[str] = None
+    reactions: Reactions | None = None
+    pull_request: PullRequest | None = None
+    body_html: str | None = None
+    body_text: str | None = None
+    timeline_url: str | None = None
+    body: str | None = None
 
 
 @dataclass