Merge branch 'master' into docstrings

Author: jsa34

.github/workflows/main.yml

@@ -11,10 +11,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - python-version: "3.8"
-            toxfactor: py3.8
-            ignore-typecheck-outcome: false
-            ignore-test-outcome: false
           - python-version: "3.9"
             toxfactor: py3.9
             ignore-typecheck-outcome: false
@@ -31,7 +27,7 @@ jobs:
             toxfactor: py3.12
             ignore-typecheck-outcome: false
             ignore-test-outcome: false
-          - python-version: "3.13-dev"
+          - python-version: "3.13"
             toxfactor: py3.13
             ignore-typecheck-outcome: false
             ignore-test-outcome: false

.pre-commit-config.yaml

@@ -22,10 +22,12 @@ repos:
     rev: v3.18.0
     hooks:
     -   id: pyupgrade
-        args: ["--py38-plus"]
-# TODO: Enable mypy checker when the checks succeed
-#-   repo: https://github.com/pre-commit/mirrors-mypy
-#    rev: v0.931
-#    hooks:
-#    -   id: mypy
-#        additional_dependencies: [types-setuptools]
+        args: ["--py39-plus"]
+-   repo: https://github.com/pycqa/flake8
+    rev: "7.1.1"
+    hooks:
+    -   id: flake8
+        additional_dependencies: [
+          "flake8-pyproject",
+          "flake8-bugbear",
+        ]

CHANGES.rst

@@ -3,6 +3,10 @@ Changelog
 
 Unreleased
 ----------
+- Dropped support for python 3.8. Supported python versions: 3.9, 3.10, 3.11, 3.12, 3.13.
+
+8.0.0b2
+----------
 - Update documentation to clarify that `--gherkin-terminal-reporter` needs to be used with `-v` or `-vv`.
 - Drop compatibility with pytest < 7.0.0.
 - Continuation of steps using asterisks instead of And/But supported.

docs/conf.py

@@ -20,8 +20,6 @@
 
 sys.path.insert(0, os.path.abspath(".."))
 
-import pytest_bdd
-
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -175,11 +173,11 @@
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
+    # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
+    # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-bdd"
-version = "8.0.0b1"
+version = "8.0.0b2"
 description = "BDD for pytest"
 authors = ["Oleg Pidsadnyi <[email protected]>", "Anatoly Bubenkov <[email protected]>"]
 maintainers = ["Alessio Bogon <[email protected]>"]
@@ -20,7 +20,6 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Utilities",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -58,7 +57,14 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
-target-version = ["py38", "py39", "py310", "py311", "py312"]
+target-version = ["py39", "py310", "py311", "py312", "py313"]
+
+[tool.flake8]
+# E1: indentation: already covered by `black`
+# E2: whitespace: already covered by `black`
+# E3: blank line: already covered by `black`
+# E501: line length: already covered by `black`
+extend-ignore = "E1,E2,E3,E501"
 
 [tool.isort]
 profile = "black"
@@ -90,7 +96,7 @@ source = [
 
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 warn_return_any = true
 warn_unused_configs = true
 files = "src/pytest_bdd/**/*.py"

src/pytest_bdd/generation.py

@@ -16,7 +16,8 @@
 from .types import STEP_TYPES
 
 if TYPE_CHECKING:
-    from typing import Any, Sequence
+    from collections.abc import Sequence
+    from typing import Any
 
     from _pytest.config import Config
     from _pytest.config.argparsing import Parser

src/pytest_bdd/parser.py

@@ -4,8 +4,9 @@
 import re
 import textwrap
 from collections import OrderedDict
+from collections.abc import Iterable, Mapping, Sequence
 from dataclasses import dataclass, field
-from typing import Any, Dict, Iterable, List, Mapping, Optional, Sequence
+from typing import Any
 
 from .exceptions import StepError
 from .gherkin_parser import Background as GherkinBackground

src/pytest_bdd/parsers.py

@@ -4,7 +4,7 @@
 
 import abc
 import re as base_re
-from typing import Any, Dict, TypeVar, cast, overload
+from typing import Any, TypeVar, cast, overload
 
 import parse as base_parse
 from parse_type import cfparse as base_cfparse
@@ -66,7 +66,7 @@ def parse_arguments(self, name: str) -> dict[str, Any]:
 
         :return: `dict` of step arguments
         """
-        return cast(Dict[str, Any], self.parser.parse(name).named)
+        return cast(dict[str, Any], self.parser.parse(name).named)
 
     def is_matching(self, name: str) -> bool:
         """Match given name with the step name."""

src/pytest_bdd/plugin.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Generator, TypeVar, cast
+from collections.abc import Generator
+from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast
 
 import pytest
 from typing_extensions import ParamSpec

src/pytest_bdd/scenario.py

@@ -17,7 +17,8 @@
 import logging
 import os
 import re
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, List, TypeVar, cast
+from collections.abc import Iterable, Iterator
+from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast
 
 import pytest
 from _pytest.fixtures import FixtureDef, FixtureManager, FixtureRequest, call_fixture_func
@@ -50,7 +51,7 @@ def find_fixturedefs_for_step(step: Step, fixturemanager: FixtureManager, node:
     # happens to be that _arg2fixturedefs is changed during the iteration so we use a copy
     fixture_def_by_name = list(fixturemanager._arg2fixturedefs.items())
     for fixturename, fixturedefs in fixture_def_by_name:
-        for pos, fixturedef in enumerate(fixturedefs):
+        for _, fixturedef in enumerate(fixturedefs):
             step_func_context = getattr(fixturedef.func, "_pytest_bdd_step_context", None)
             if step_func_context is None:
                 continue
@@ -62,7 +63,7 @@ def find_fixturedefs_for_step(step: Step, fixturemanager: FixtureManager, node:
             if not match:
                 continue
 
-            fixturedefs = cast(List[FixtureDef[Any]], getfixturedefs(fixturemanager, fixturename, node) or [])
+            fixturedefs = cast(list[FixtureDef[Any]], getfixturedefs(fixturemanager, fixturename, node) or [])
             if fixturedef not in fixturedefs:
                 continue