From 4ac06da2f409881b1a26834a73a2a1d867093358 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Tue, 12 Jul 2022 10:24:28 +0200 Subject: [PATCH] fix rebase artefacts --- src/_pytest/config/findpaths.py | 3 +-- testing/test_config.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/_pytest/config/findpaths.py b/src/_pytest/config/findpaths.py index b9f7b092b..6937554ae 100644 --- a/src/_pytest/config/findpaths.py +++ b/src/_pytest/config/findpaths.py @@ -1,6 +1,5 @@ import os import sys -import warnings from pathlib import Path from typing import Dict from typing import Iterable @@ -81,7 +80,7 @@ def _parse_cfg_file(path: Path) -> PARSE_RESULT: def _parse_pyproject_ini_options( - path: Path, + filepath: Path, ) -> PARSE_RESULT: """Load backward compatible ini options from pyproject.toml""" diff --git a/testing/test_config.py b/testing/test_config.py index 722ac838f..a1f4fbb8a 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -113,7 +113,7 @@ class TestParseIni: @pytest.mark.parametrize( "section, name", [ - pytest.param("tool:pytest", "setup.cfg", marks=setup_cfg_nowarn), + pytest.param("tool:pytest", "setup.cfg"), ("pytest", "tox.ini"), ("pytest", "pytest.ini"), ("pytest", ".pytest.ini"),