From bc9dc84876bed120c67c73bb6fcd2d8045198090 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 1 Nov 2022 12:16:04 +0200 Subject: Quiesce pytest warnings (#916) * Skip doctest of deprecated format_number * Don't return from test_compatible_classes_in_global_and_localedata * Renovate conftest (and require pytest 6+) --- conftest.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'conftest.py') diff --git a/conftest.py b/conftest.py index bd9f2d3..3982cef 100644 --- a/conftest.py +++ b/conftest.py @@ -1,14 +1,20 @@ +from pathlib import Path + from _pytest.doctest import DoctestModule -from py.path import local collect_ignore = ['tests/messages/data', 'setup.py'] -babel_path = local(__file__).dirpath().join('babel') +babel_path = Path(__file__).parent / 'babel' + + +# Via the stdlib implementation of Path.is_relative_to in Python 3.9 +def _is_relative(p1: Path, p2: Path) -> bool: + try: + p1.relative_to(p2) + return True + except ValueError: + return False -def pytest_collect_file(path, parent): - if babel_path.common(path) == babel_path: - if path.ext == ".py": - # TODO: remove check when dropping support for old Pytest - if hasattr(DoctestModule, "from_parent"): - return DoctestModule.from_parent(parent, fspath=path) - return DoctestModule(path, parent) +def pytest_collect_file(file_path: Path, parent): + if _is_relative(file_path, babel_path) and file_path.suffix == '.py': + return DoctestModule.from_parent(parent, path=file_path) -- cgit v1.2.1