Clean Up Black and Isort Config (#2449)

Co-authored-by: Adam Hopkins <adam@amhopkins.com>

.black.toml

@@ -1,2 +0,0 @@
-[tool.black]
-line-length = 79

Makefile

@@ -66,15 +66,15 @@ ifdef include_tests
 	isort -rc sanic tests
 else
 	$(info Sorting Imports)
-	isort -rc sanic tests  --profile=black
+	isort -rc sanic tests
 endif
 endif
 
 black:
-	black --config ./.black.toml sanic tests
+	black sanic tests
 
 isort:
-	isort sanic tests --profile=black
+	isort sanic tests
 
 pretty: black isort
 

pyproject.toml

@@ -1,3 +1,18 @@
 [build-system]
 requires = ["setuptools<60.0", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 79
+
+[tool.isort]
+atomic = true
+default_section = "THIRDPARTY"
+include_trailing_comma = true
+known_first_party = "sanic"
+known_third_party = "pytest"
+line_length = 79
+lines_after_imports = 2
+lines_between_types = 1
+multi_line_output = 3
+profile = "black"

setup.cfg

@@ -1,13 +1,2 @@
 [flake8]
 ignore = E203, W503
-
-[isort]
-atomic = true
-default_section = THIRDPARTY
-include_trailing_comma = true
-known_first_party = sanic
-known_third_party = pytest
-line_length = 79
-lines_after_imports = 2
-lines_between_types = 1
-multi_line_output = 3

tests/test_asgi.py

@@ -9,7 +9,7 @@ import uvicorn
 from sanic import Sanic
 from sanic.application.state import Mode
 from sanic.asgi import MockTransport
-from sanic.exceptions import Forbidden, BadRequest, ServiceUnavailable
+from sanic.exceptions import BadRequest, Forbidden, ServiceUnavailable
 from sanic.request import Request
 from sanic.response import json, text
 from sanic.server.websockets.connection import WebSocketConnection

tests/test_blueprint_group.py

@@ -3,12 +3,7 @@ from pytest import raises
 from sanic.app import Sanic
 from sanic.blueprint_group import BlueprintGroup
 from sanic.blueprints import Blueprint
-from sanic.exceptions import (
+from sanic.exceptions import BadRequest, Forbidden, SanicException, ServerError
-    Forbidden,
-    BadRequest,
-    SanicException,
-    ServerError,
-)
 from sanic.request import Request
 from sanic.response import HTTPResponse, text
 

tests/test_blueprints.py

@@ -7,12 +7,7 @@ import pytest
 from sanic.app import Sanic
 from sanic.blueprints import Blueprint
 from sanic.constants import HTTP_METHODS
-from sanic.exceptions import (
+from sanic.exceptions import BadRequest, NotFound, SanicException, ServerError
-    BadRequest,
-    NotFound,
-    SanicException,
-    ServerError,
-)
 from sanic.request import Request
 from sanic.response import json, text
 

tests/test_exceptions_handler.py

@@ -10,7 +10,7 @@ from bs4 import BeautifulSoup
 from pytest import LogCaptureFixture, MonkeyPatch
 
 from sanic import Sanic, handlers
-from sanic.exceptions import Forbidden, BadRequest, NotFound, ServerError
+from sanic.exceptions import BadRequest, Forbidden, NotFound, ServerError
 from sanic.handlers import ErrorHandler
 from sanic.request import Request
 from sanic.response import stream, text

tox.ini

@@ -19,8 +19,8 @@ commands =
 [testenv:lint]
 commands =
     flake8 sanic
-    black --config ./.black.toml --check --verbose sanic/
+    black --check --verbose sanic/
-    isort --check-only sanic --profile=black
+    isort --check-only sanic
     slotscheck --verbose -m sanic
 
 [testenv:type-checking]