Merge branch 'master' into add-mode

Author: art049

.github/workflows/codspeed.yml

@@ -8,35 +8,42 @@ on:
 
 env:
   PYTHON_VERSION: "3.12"
+  SHARDS: 4
 
 jobs:
-  benchmarks-instrumentation:
+  benchmarks:
     strategy:
       matrix:
-        include:
-          - mode: "instrumentation"
-            runs-on: ubuntu-24.04
-          - mode: "walltime"
-            runs-on: codspeed-macro
+        shard: [1, 2, 3, 4]
+        mode: ["instrumentation", "walltime"]
 
-    name: Run ${{ matrix.mode }} benchmarks
-    runs-on: ${{ matrix.runs-on }}
+    name: "Run ${{ matrix.mode }} benchmarks (Shard #${{ matrix.shard }})"
+    runs-on: ${{ matrix.mode == 'instrumentation' && 'ubuntu-24.04' || 'codspeed-macro' }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
+      - name: Install required-version defined in uv.toml
+        uses: astral-sh/setup-uv@v5
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Install local version of pytest-codspeed
         run: |
           sudo apt-get update
           sudo apt-get install valgrind -y
-          pip install .
+          uv sync --dev
           sudo apt-get remove valgrind -y
       - name: Run benchmarks
         uses: CodSpeedHQ/action@main
         with:
           mode: ${{ matrix.mode }}
-          run: pytest tests/benchmarks/ --codspeed
+          run: uv run pytest tests/benchmarks/ --codspeed --test-group=${{ matrix.shard }} --test-group-count=${{ env.SHARDS }}
           token: ${{ secrets.CODSPEED_TOKEN }}
+
+  all-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "All CI checks passed."
+    needs:
+      - benchmarks

pyproject.toml

@@ -37,19 +37,24 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-lint = ["mypy ~= 1.11.2", "ruff ~= 0.11.12"]
 compat = [
     "pytest-benchmark ~= 5.0.0",
     "pytest-xdist ~= 3.6.1",
     # "pytest-speed>=0.3.5",
 ]
-test = ["pytest ~= 7.0", "pytest-cov ~= 4.0.0"]
 
 [tool.uv.sources]
 pytest-codspeed = { workspace = true }
 
 [dependency-groups]
-dev = ["pytest-codspeed"]
+dev = [
+    "pytest-codspeed",
+    "mypy ~= 1.11.2",
+    "ruff ~= 0.11.12",
+    "pytest ~= 7.0",
+    "pytest-cov ~= 4.0.0",
+    "pytest-test-groups>=1.1.0",
+]
 
 [project.entry-points]
 pytest11 = { codspeed = "pytest_codspeed.plugin" }

src/pytest_codspeed/instruments/__init__.py

@@ -8,11 +8,13 @@
     from typing import Any, Callable, ClassVar, TypeVar
 
     import pytest
+    from typing_extensions import ParamSpec
 
     from pytest_codspeed.config import BenchmarkMarkerOptions, PedanticOptions
     from pytest_codspeed.plugin import CodSpeedConfig
 
     T = TypeVar("T")
+    P = ParamSpec("P")
 
 
 class Instrument(metaclass=ABCMeta):
@@ -30,9 +32,9 @@ def measure(
         marker_options: BenchmarkMarkerOptions,
         name: str,
         uri: str,
-        fn: Callable[..., T],
-        *args: tuple,
-        **kwargs: dict[str, Any],
+        fn: Callable[P, T],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> T: ...
 
     @abstractmethod

src/pytest_codspeed/instruments/valgrind.py

@@ -14,7 +14,7 @@
     from pytest import Session
 
     from pytest_codspeed.config import PedanticOptions
-    from pytest_codspeed.instruments import T
+    from pytest_codspeed.instruments import P, T
     from pytest_codspeed.plugin import BenchmarkMarkerOptions, CodSpeedConfig
 
 
@@ -52,9 +52,9 @@ def measure(
         marker_options: BenchmarkMarkerOptions,
         name: str,
         uri: str,
-        fn: Callable[..., T],
-        *args: tuple,
-        **kwargs: dict[str, Any],
+        fn: Callable[P, T],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> T:
         self.benchmark_count += 1
 

src/pytest_codspeed/instruments/walltime.py

@@ -24,7 +24,7 @@
     from pytest import Session
 
     from pytest_codspeed.config import PedanticOptions
-    from pytest_codspeed.instruments import T
+    from pytest_codspeed.instruments import P, T
     from pytest_codspeed.plugin import BenchmarkMarkerOptions, CodSpeedConfig
 
 DEFAULT_WARMUP_TIME_NS = 1_000_000_000
@@ -187,9 +187,9 @@ def measure(
         marker_options: BenchmarkMarkerOptions,
         name: str,
         uri: str,
-        fn: Callable[..., T],
-        *args: tuple,
-        **kwargs: dict[str, Any],
+        fn: Callable[P, T],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> T:
         benchmark_config = BenchmarkConfig.from_codspeed_config_and_marker_data(
             self.config, marker_options

src/pytest_codspeed/plugin.py

@@ -30,11 +30,12 @@
 from . import __version__
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, TypeVar
+    from typing import Any, Callable, ParamSpec, TypeVar
 
     from pytest_codspeed.instruments import Instrument
 
     T = TypeVar("T")
+    P = ParamSpec("P")
 
 
 @pytest.hookimpl(trylast=True)
@@ -264,10 +265,10 @@ def wrap_runtest(
     plugin: CodSpeedPlugin,
     node: pytest.Item,
     config: pytest.Config,
-    fn: Callable[..., T],
-) -> Callable[..., T]:
+    fn: Callable[P, T],
+) -> Callable[P, T]:
     @functools.wraps(fn)
-    def wrapped(*args: tuple, **kwargs: dict[str, Any]) -> T:
+    def wrapped(*args: P.args, **kwargs: P.kwargs) -> T:
         return _measure(plugin, node, config, None, fn, args, kwargs)
 
     return wrapped
@@ -328,9 +329,7 @@ def __init__(self, request: pytest.FixtureRequest):
         self._plugin = get_plugin(self._config)
         self._called = False
 
-    def __call__(
-        self, target: Callable[..., T], *args: tuple, **kwargs: dict[str, Any]
-    ) -> T:
+    def __call__(self, target: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> T:
         if self._called:
             raise RuntimeError("The benchmark fixture can only be used once per test")
         self._called = True