From 850d27c0c08582f9fd845270880660415655405e Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 3 Nov 2022 14:50:39 +0000
Subject: [PATCH] Move as much configuration as possible into pyproject.toml

---
 pyproject.toml | 31 +++++++++++++++++++++++++++++++
 setup.cfg      | 31 +------------------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b8820f2..a4101b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,3 +11,34 @@ custom_blocks="cache"
 
 [tool.djlint.per-file-ignores]
 "_snippet_link.html" = "H025"
+
+[tool.isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+line_length = 88
+skip_glob = "env/*"
+
+[tool.mypy]
+no_implicit_optional = true
+warn_unused_ignores = true
+strict_optional = true
+check_untyped_defs = true
+ignore_missing_imports = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+exclude = [
+  '^docker/dev/volumes',
+  '^env'
+]
+
+[tool.coverage.report]
+exclude_lines = [
+  "pragma: no cover",
+  "if settings.DEBUG"
+]
+omit = [
+  "*/migrations/*",
+]
diff --git a/setup.cfg b/setup.cfg
index 8126e5b..8fe1522 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,33 +1,4 @@
-[mypy]
-no_implicit_optional = True
-warn_unused_ignores = True
-strict_optional = True
-check_untyped_defs = True
-ignore_missing_imports = True
-disallow_untyped_calls = True
-disallow_untyped_defs = True
-disallow_incomplete_defs = True
-exclude = (?x)(
-    ^docker/dev/volumes
-    | ^env
-  )
-
-
-[isort]
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-use_parentheses=True
-line_length=88
-skip_glob=env/*
-
+# flake8 doesn't support pyproject.toml yet https://github.com/PyCQA/flake8/issues/234
 [flake8]
 extend_ignore=E128,E501
 extend_exclude=env
-
-[coverage:report]
-exclude_lines =
-  pragma: no cover
-  if settings.DEBUG
-omit =
-  */migrations/*