Merge pull request #301 from hugovk/add-3.14

Author: justinmayer

.github/workflows/build-and-test.yaml

@@ -1,6 +1,6 @@
 name: build
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test:
@@ -9,21 +9,21 @@ jobs:
       fail-fast: false # run all tests anyway
       matrix:
         include:
-          # Python 3.8 && Pytest 6.2
-          - toxenv: py38-pytest62-supported-xdist
-            python: 3.8
+          # Python 3.10 && Pytest 7
+          - toxenv: py310-pytest7-supported-xdist
+            python: "3.10"
 
           # Latest Python & Pytest
-          - toxenv: py313-pytest_latest-supported-xdist
-            python: 3.13
+          - toxenv: py314-pytest_latest-supported-xdist
+            python: 3.14
 
           # QA
           - toxenv: qa
-            python: 3.8
+            python: "3.10"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           cache: 'pip'
@@ -48,12 +48,12 @@ jobs:
     if: github.ref=='refs/heads/main' && github.event_name!='pull_request'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.9"
+          python-version: "3.x"
 
       - name: Check release
         id: check_release

.pre-commit-config.yaml

@@ -17,9 +17,9 @@ repos:
     rev: v3.15.0
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py310-plus]
 
-  - repo: https://github.com/psf/black
+  - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 24.1.1
     hooks:
       - id: black

README.md

@@ -93,8 +93,8 @@ For long-running tests, display minutes and not only seconds.
 
 You will need the following prerequisites in order to use pytest-sugar:
 
-- Python 3.8 or newer
-- pytest 6.2 or newer
+- Python 3.10 or newer
+- pytest 7 or newer
 
 ## Running on Windows
 

pyproject.toml

@@ -22,8 +22,8 @@ Homepage = "https://github.com/Teemu/pytest-sugar"
 "Issue Tracker" = "https://github.com/Teemu/pytest-sugar/issues"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4.0"
-pytest = ">=6.2.0"
+python = ">=3.10,<4.0"
+pytest = ">=7"
 termcolor = ">=2.1.0"
 
 [tool.poetry.dev-dependencies]

pytest_sugar.py

@@ -15,8 +15,9 @@
 import re
 import sys
 import time
+from collections.abc import Generator, Sequence
 from configparser import ConfigParser  # type: ignore
-from typing import Any, Dict, Generator, List, Optional, Sequence, TextIO, Tuple, Union
+from typing import Any, TextIO
 
 import pytest
 from _pytest.config import Config
@@ -32,23 +33,23 @@
 LEN_RIGHT_MARGIN = 0
 LEN_PROGRESS_PERCENTAGE = 5
 LEN_PROGRESS_BAR_SETTING = "10"
-LEN_PROGRESS_BAR: Optional[int] = None
+LEN_PROGRESS_BAR: int | None = None
 
 
 @dataclasses.dataclass
 class Theme:
-    header: Optional[str] = "magenta"
-    skipped: Optional[str] = "blue"
-    success: Optional[str] = "green"
-    warning: Optional[str] = "yellow"
-    fail: Optional[str] = "red"
-    error: Optional[str] = "red"
-    xfailed: Optional[str] = "green"
-    xpassed: Optional[str] = "red"
-    progressbar: Optional[str] = "green"
-    progressbar_fail: Optional[str] = "red"
-    progressbar_background: Optional[str] = "grey"
-    path: Optional[str] = "cyan"
+    header: str | None = "magenta"
+    skipped: str | None = "blue"
+    success: str | None = "green"
+    warning: str | None = "yellow"
+    fail: str | None = "red"
+    error: str | None = "red"
+    xfailed: str | None = "green"
+    xpassed: str | None = "red"
+    progressbar: str | None = "green"
+    progressbar_fail: str | None = "red"
+    progressbar_background: str | None = "grey"
+    path: str | None = "cyan"
     name = None
     symbol_passed: str = "✓"
     symbol_skipped: str = "s"
@@ -57,16 +58,16 @@ class Theme:
     symbol_xfailed_skipped: str = "x"
     symbol_xfailed_failed: str = "X"
     symbol_unknown: str = "?"
-    unknown: Optional[str] = "blue"
-    symbol_rerun: Optional[str] = "R"
-    rerun: Optional[str] = "blue"
+    unknown: str | None = "blue"
+    symbol_rerun: str | None = "R"
+    rerun: str | None = "blue"
 
     def __getitem__(self, x):
         return getattr(self, x)
 
 
 THEME: Theme = Theme()
-PROGRESS_BAR_BLOCKS: List[str] = [
+PROGRESS_BAR_BLOCKS: list[str] = [
     " ",
     "▏",
     "▎",
@@ -155,16 +156,16 @@ def pytest_sessionstart(session: Session) -> None:
     config = ConfigParser()
     config.read(["pytest-sugar.conf", os.path.expanduser("~/.pytest-sugar.conf")])
 
-    theme_attributes: Dict[str, Optional[str]] = {}
-    fields: Tuple[dataclasses.Field, ...] = dataclasses.fields(Theme)
+    theme_attributes: dict[str, str | None] = {}
+    fields: tuple[dataclasses.Field, ...] = dataclasses.fields(Theme)
 
     for field in fields:
         key = field.name
         if not config.has_option("theme", key):
             continue
 
         value_str: str = config.get("theme", key).lower()
-        value: Optional[str] = value_str
+        value: str | None = value_str
         if value in ("", "none"):
             value = None
 
@@ -212,7 +213,7 @@ def pytest_configure(config) -> None:
         config.pluginmanager.register(sugar_reporter, "terminalreporter")
 
 
-def pytest_report_teststatus(report: BaseReport) -> Optional[Tuple[str, str, str]]:
+def pytest_report_teststatus(report: BaseReport) -> tuple[str, str, str] | None:
     if not IS_SUGAR_ENABLED:
         return None
 
@@ -247,7 +248,7 @@ def pytest_report_teststatus(report: BaseReport) -> Optional[Tuple[str, str, str
 
 
 class SugarTerminalReporter(TerminalReporter):
-    def __init__(self, config: Config, file: Union[TextIO, None] = None) -> None:
+    def __init__(self, config: Config, file: TextIO | None = None) -> None:
         TerminalReporter.__init__(self, config, file)
         self.paths_left = []
         self.tests_count = 0
@@ -287,12 +288,8 @@ def pytest_sessionstart(self, session: Session) -> None:
             ),
             bold=True,
         )
-        if int(pytest.__version__.split(".")[0]) <= 6:
-            hook_call_kwargs = {"startdir": self.startpath}
-        else:
-            hook_call_kwargs = {"start_path": self.startpath}
         lines = self.config.hook.pytest_report_header(
-            config=self.config, **hook_call_kwargs
+            config=self.config, start_path=self.startpath
         )
         lines.reverse()
         for line in flatten(lines):
@@ -301,7 +298,7 @@ def pytest_sessionstart(self, session: Session) -> None:
     def write_fspath_result(self, nodeid: str, res, **markup: bool) -> None:
         return
 
-    def insert_progress(self, report: Union[CollectReport, TestReport]) -> None:
+    def insert_progress(self, report: CollectReport | TestReport) -> None:
         def get_progress_bar() -> str:
             length = LEN_PROGRESS_BAR
             if not length:
@@ -397,7 +394,7 @@ def get_max_column_for_test_status(self) -> int:
         )
 
     def begin_new_line(
-        self, report: Union[CollectReport, TestReport], print_filename: bool
+        self, report: CollectReport | TestReport, print_filename: bool
     ) -> None:
         path = self.report_key(report)
         self.current_line_num += 1
@@ -435,7 +432,7 @@ def begin_new_line(
         self.write("\r\n")
 
     def reached_last_column_for_test_status(
-        self, report: Union[CollectReport, TestReport]
+        self, report: CollectReport | TestReport
     ) -> bool:
         len_line = real_string_length(self.current_lines[self.report_key(report)])
         return len_line >= self.get_max_column_for_test_status()
@@ -450,14 +447,14 @@ def pytest_runtest_logfinish(self, nodeid: str) -> None:
         # pytest's default progress
         pass
 
-    def report_key(self, report: Union[CollectReport, TestReport]) -> Any:
+    def report_key(self, report: CollectReport | TestReport) -> Any:
         """Returns a key to identify which line the report should write to."""
         return (
             (report.location or "") if self.showlongtestinfo else (report.fspath or "")
         )
 
     def pytest_runtest_logreport(self, report: TestReport) -> None:
-        global LEN_PROGRESS_BAR_SETTING, LEN_PROGRESS_BAR
+        global LEN_PROGRESS_BAR
 
         res = pytest_report_teststatus(report=report)
         assert res
@@ -615,7 +612,7 @@ def summary_stats(self) -> None:
                 colored("   % 5d deselected" % self.count("deselected"), THEME.warning)
             )
 
-    def _find_playwright_trace(self, report: TestReport) -> Optional[str]:
+    def _find_playwright_trace(self, report: TestReport) -> str | None:
         """
         Finds the Playwright trace file associated with a specific test report.
 
@@ -727,7 +724,7 @@ def summary_errors(self) -> None:
         # show the error instantly after error has occurred.
         pass
 
-    def print_failure(self, report: Union[CollectReport, TestReport]) -> None:
+    def print_failure(self, report: CollectReport | TestReport) -> None:
         # https://github.com/Frozenball/pytest-sugar/issues/34
         if hasattr(report, "wasxfail"):
             return

setup.py

@@ -26,7 +26,7 @@ def get_version(filename):
         " look and feel of pytest (e.g. progressbar, show tests that"
         " fail instantly)."
     ),
-    long_description=codecs.open("README.md", encoding="utf-8").read(),
+    long_description=open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",
     version=get_version("pytest_sugar.py"),
     url="https://github.com/Teemu/pytest-sugar",
@@ -41,7 +41,7 @@ def get_version(filename):
     zip_safe=False,
     include_package_data=True,
     platforms="any",
-    install_requires=["pytest>=6.2.0", "termcolor>=2.1.0"],
+    install_requires=["pytest>=7", "termcolor>=2.1.0"],
     extras_require={
         "dev": [
             "black",
@@ -60,12 +60,11 @@ def get_version(filename):
         "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",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
 )

test_sugar.py

@@ -114,7 +114,7 @@ def test_sample():
     def test_report_header(self, testdir):
         testdir.makeconftest(
             """
-            def pytest_report_header(startdir):
+            def pytest_report_header(start_path):
                 pass
             """
         )

tox.ini

@@ -1,13 +1,13 @@
 [tox]
 minversion = 3.14.0
-envlist = py{38,313,py}-pytest_latest-supported-xdist
+envlist = py{310,314,py}-pytest_latest-supported-xdist
           qa
 requires = virtualenv>=20.0.31
 
 [testenv]
 install_command = python -m pip install --use-feature=fast-deps {opts} {packages}
 deps =
-    pytest62: pytest~=6.2.5
+    pytest7: pytest~=7.4
     pytest_latest: pytest
     termcolor>=1.1.0
     supported-xdist: pytest-xdist