From 2e77b4ea126e59cf5632c1ecbc9568d80c8853aa Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 4 Mar 2024 12:20:36 +0100 Subject: [PATCH] remove deprecated LEGACY_PATH support. Pytest 8.1.0 removed support for that. No need to change our supported Pytest range, the modern pathlib.Path support has been there since Pytest 7.0 --- Makefile | 2 +- cwltest/plugin.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c5771b5..3207ee5 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) DEVPKGS=-rdev-requirements.txt -rtest-requirements.txt -rmypy-requirements.txt DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \ python-flake8 python-mock shellcheck -VERSION=2.4.$(shell TZ=UTC git log --first-parent --max-count=1 \ +VERSION=2.5.$(shell TZ=UTC git log --first-parent --max-count=1 \ --format=format:%cd --date=format-local:%Y%m%d%H%M%S) ## all : default task (install in dev mode) diff --git a/cwltest/plugin.py b/cwltest/plugin.py index 1a5e5b1..b764f3b 100644 --- a/cwltest/plugin.py +++ b/cwltest/plugin.py @@ -27,7 +27,6 @@ if TYPE_CHECKING: from _pytest._code.code import ExceptionInfo, _TracebackStyle - from _pytest.compat import LEGACY_PATH from _pytest.config import Config from _pytest.config import Config as PytestConfig from _pytest.config import PytestPluginManager @@ -342,7 +341,7 @@ def _doc_options() -> argparse.ArgumentParser: def pytest_collect_file( - file_path: Path, path: "LEGACY_PATH", parent: pytest.Collector + file_path: Path, parent: pytest.Collector ) -> Optional[pytest.Collector]: """Is this file for us.""" if (