Merge branch 'master' into scenarios-codegen-take2

Author: Pierre-Sassoulas

.github/workflows/main.yml

@@ -45,10 +45,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: "3.9"
-            toxfactor: py3.9
-            ignore-typecheck-outcome: false
-            ignore-test-outcome: false
           - python-version: "3.10"
             toxfactor: py3.10
             ignore-typecheck-outcome: false

.gitignore

@@ -54,3 +54,6 @@ cover/
 
 #PyCharm
 /.idea
+
+# Generated by the tox mypy env (poetry export)
+/requirements.txt

CHANGES.rst

@@ -23,6 +23,7 @@ Deprecated
 
 Removed
 +++++++
+* Dropped support for python 3.9 (end-of-life, and its locked dev dependencies had unfixable security alerts). Supported python versions: 3.10, 3.11, 3.12, 3.13, 3.14.
 * The following private attributes are not available anymore (`#658 <https://github.com/pytest-dev/pytest-bdd/pull/658>`_):
   * ``_pytest.reports.TestReport.scenario``; replaced by ``pytest_bdd.reporting.test_report_context`` WeakKeyDictionary (internal use)
   * ``__scenario__`` attribute of test functions generated by the ``@scenario`` (and ``@scenarios``) decorator; replaced by ``pytest_bdd.scenario.scenario_wrapper_template_registry`` WeakKeyDictionary (internal use)

poetry.lock

@@ -22,14 +22,13 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Utilities",
     "Programming Language :: Python :: 3",
-    "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",
     "Programming Language :: Python :: 3.14",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "Mako",
     "parse",
@@ -74,7 +73,6 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 line-length = 120
-target-version = "py39"
 lint.select = [
     "B",     # flake8-bugbear
     "BLE",   # flake8-blind-except

pyproject.toml

@@ -121,8 +121,7 @@ def as_contexts(self) -> Generator[dict[str, str]]:
             dict[str, str]: A dictionary mapping parameter names to their values for each example row.
         """
         for row in self.examples:
-            assert len(self.example_params) == len(row)
-            yield dict(zip(self.example_params, row))
+            yield dict(zip(self.example_params, row, strict=True))
 
     def __bool__(self) -> bool:
         """Check if there are any examples.

src/pytest_bdd/parser.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Generator
-from typing import TYPE_CHECKING, Callable, TypeVar, cast
+from collections.abc import Callable, Generator
+from typing import TYPE_CHECKING, ParamSpec, TypeVar, cast
 
 import pytest
-from typing_extensions import ParamSpec
 
 from . import cucumber_json, generation, gherkin_terminal_reporter, given, reporting, then, when
 from .utils import CONFIG_STACK

src/pytest_bdd/plugin.py

@@ -7,8 +7,9 @@
 from __future__ import annotations
 
 import time
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, TypedDict
+from typing import TYPE_CHECKING, TypedDict
 from weakref import WeakKeyDictionary
 
 from typing_extensions import NotRequired

src/pytest_bdd/reporting.py

@@ -17,13 +17,14 @@
 import logging
 import os
 import re
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from inspect import signature
-from typing import TYPE_CHECKING, Callable, TypeVar, cast
+from typing import TYPE_CHECKING, TypeVar, cast
 from weakref import WeakKeyDictionary
 
 import pytest
 from _pytest.fixtures import FixtureDef, FixtureManager, FixtureRequest, call_fixture_func
+from _pytest.outcomes import Failed
 
 from . import exceptions
 from .compat import getfixturedefs, inject_fixture
@@ -247,7 +248,7 @@ def _execute_step_function(
         # so that we can allow "yield" statements in it
         return_value = call_fixture_func(fixturefunc=context.step_func, request=request, kwargs=kwargs)
 
-    except Exception as exception:
+    except (Exception, Failed) as exception:
         request.config.hook.pytest_bdd_step_error(exception=exception, **kw)
         raise
 

src/pytest_bdd/scenario.py

@@ -38,14 +38,13 @@ def _(article):
 from __future__ import annotations
 
 import enum
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass, field
 from itertools import count
-from typing import Callable, Literal, TypeVar
+from typing import Literal, ParamSpec, TypeVar
 from weakref import WeakKeyDictionary
 
 import pytest
-from typing_extensions import ParamSpec
 
 from .parser import Step
 from .parsers import StepParser, get_parser