From: Taneli Hukkinen <hukkinj1@users.noreply.github.com>
Date: Sat, 4 Jul 2020 21:31:09 +0000 (+0300)
Subject: Make isort configuration compatible with isort v5 (#1050)
X-Git-Tag: 0.14.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dea2c23d70145355951baa9c1c3a8291cc4c17f;p=thirdparty%2Fhttpx.git

Make isort configuration compatible with isort v5 (#1050)

* Make isort configuration compatible with isort v5

* Use isort's black profile
---

diff --git a/httpx/_transports/asgi.py b/httpx/_transports/asgi.py
index 2e228209..dc44850d 100644
--- a/httpx/_transports/asgi.py
+++ b/httpx/_transports/asgi.py
@@ -8,6 +8,7 @@ from .._utils import warn_deprecated
 
 if TYPE_CHECKING:  # pragma: no cover
     import asyncio
+
     import trio
 
     Event = Union[asyncio.Event, trio.Event]
diff --git a/scripts/check b/scripts/check
index f25b220c..2b42506f 100755
--- a/scripts/check
+++ b/scripts/check
@@ -11,4 +11,4 @@ set -x
 ${PREFIX}black --check --diff --target-version=py36 $SOURCE_FILES
 ${PREFIX}flake8 $SOURCE_FILES
 ${PREFIX}mypy httpx
-${PREFIX}isort --check --diff --project=httpx --recursive $SOURCE_FILES
+${PREFIX}isort --check --diff --project=httpx $SOURCE_FILES
diff --git a/scripts/lint b/scripts/lint
index 5141cca0..a8cab1a6 100755
--- a/scripts/lint
+++ b/scripts/lint
@@ -10,5 +10,5 @@ set -x
 
 ${PREFIX}autoflake --in-place --recursive $SOURCE_FILES
 ${PREFIX}seed-isort-config --application-directories=httpx
-${PREFIX}isort --project=httpx --recursive --apply $SOURCE_FILES
+${PREFIX}isort --project=httpx $SOURCE_FILES
 ${PREFIX}black --target-version=py36 $SOURCE_FILES
diff --git a/setup.cfg b/setup.cfg
index 98fae653..6732488f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,13 +11,10 @@ disallow_untyped_defs = False
 check_untyped_defs = True
 
 [tool:isort]
+profile = black
 combine_as_imports = True
-force_grid_wrap = 0
-include_trailing_comma = True
 known_first_party = httpx,tests
 known_third_party = brotli,certifi,chardet,cryptography,hstspreload,httpcore,pytest,rfc3986,setuptools,sniffio,trio,trustme,uvicorn
-line_length = 88
-multi_line_output = 3
 
 [tool:pytest]
 addopts = --cov=httpx --cov=tests -rxXs