Consolidate mypy and pytest config into pyproject.toml

4 files changed, 19 insertions, 14 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 9d9b332..d3f372b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-include tests *.py
 recursive-include immutables *.py *.c *.h *.pyi
 include LICENSE* NOTICE README.rst bench.png
-include mypy.ini immutables/py.typed
+include immutables/py.typed
diff --git a/mypy.ini b/mypy.ini
deleted file mode 100644
index 6b604b8..0000000
--- a/mypy.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[mypy]
-incremental = True
-strict = True
-
-[mypy-immutables.map]
-ignore_errors = True
-
-[mypy-immutables._testutils]
-ignore_errors = True
diff --git a/pyproject.toml b/pyproject.toml
index 810162d..de2ece5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,3 +4,21 @@ requires-python = ">=3.6"
 [build-system]
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "--capture=no --assert=plain --strict-markers --tb=native --import-mode=importlib"
+testpaths = "tests"
+filterwarnings = "default"
+
+[tool.mypy]
+incremental = true
+strict = true
+
+[[tool.mypy.overrides]]
+module = "immutables.map"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "immutables._testutils"
+ignore_errors = true
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 4603e34..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pytest]
-addopts = --capture=no --assert=plain --strict --tb native
-testpaths = tests
-filterwarnings = default