From af1c388ab4ed512af90d67e748666081b127611e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= Date: Fri, 26 Nov 2021 15:40:41 -0500 Subject: [PATCH] Migrate pytest.ini to pyproject.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gábor Lipták --- pyproject.toml | 10 ++++++++++ pytest.ini | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 pytest.ini diff --git a/pyproject.toml b/pyproject.toml index 8533c1aef..0da84229a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,3 +3,13 @@ target-version = ['py27', 'py33', 'py34', 'py35', 'py36', 'py37', 'py38', 'py39'] include = 'rope/.*\.pyi?$' force-exclude = 'ropetest' + +[tool.pytest.ini_options] + +python_files = [ + "*test.py", + "__init__.py", +] +markers = [ + "time_limit: sets a maximum amount of time the test can run", +] diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 10f846713..000000000 --- a/pytest.ini +++ /dev/null @@ -1,7 +0,0 @@ -[pytest] -python_files = - *test.py - __init__.py - -markers = - time_limit: sets a maximum amount of time the test can run