From eaa77647acbad798f2758312c7e4fe4bc83e861f Mon Sep 17 00:00:00 2001
From: Daniel <61800298+ffe4@users.noreply.github.com>
Date: Wed, 16 Sep 2020 05:33:27 +0200
Subject: [PATCH] Migrate pytest config to pyproject.toml (#1086)

---
 dev-requirements.txt | 2 +-
 pyproject.toml       | 4 ++++
 pytest.ini           | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 pytest.ini

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 6537a9a4448..b63248c7f0e 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -6,7 +6,7 @@ mypy==0.770
 sphinx~=2.1
 sphinx-rtd-theme~=0.4
 sphinx-autodoc-typehints~=1.10.2
-pytest!=5.2.3
+pytest>=6.0
 pytest-cov>=2.8
 readme-renderer~=24.0
 grpcio-tools==1.29.0
diff --git a/pyproject.toml b/pyproject.toml
index db4df73b69e..0c79406d055 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,3 +13,7 @@ exclude = '''
   )/
 )
 '''
+[tool.pytest.ini_options]
+addopts = "-rs -v"
+log_cli = true
+log_cli_level = "warning"
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 013d2c555c3..00000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pytest]
-addopts = -rs -v
-log_cli = true
-log_cli_level = warning