:arrow_up: Update imports and scripts for new isort versions (#75)

diff --git a/fastapi/__init__.py b/fastapi/__init__.py
index e019cc3fbb31d1bdca6598747080f882835ba412..10c0df8309c03f52f1662a3237a11f50344b303a 100644 (file)
--- a/fastapi/__init__.py
+++ b/fastapi/__init__.py
@@ -3,7 +3,7 @@
 __version__ = "0.7.1"
 
 from .applications import FastAPI
-from .routing import APIRouter
-from .params import Body, Path, Query, Header, Cookie, Form, File, Security, Depends
-from .exceptions import HTTPException
 from .datastructures import UploadFile
+from .exceptions import HTTPException
+from .params import Body, Cookie, Depends, File, Form, Header, Path, Query, Security
+from .routing import APIRouter

diff --git a/fastapi/security/__init__.py b/fastapi/security/__init__.py
index 5f2b38c2d116d800d6e4dc9ff810117084f2f84b..32d69e74d311fbf655e71998b63a0af6642a9eae 100644 (file)
--- a/fastapi/security/__init__.py
+++ b/fastapi/security/__init__.py
@@ -1,10 +1,10 @@
-from .api_key import APIKeyQuery, APIKeyHeader, APIKeyCookie
+from .api_key import APIKeyCookie, APIKeyHeader, APIKeyQuery
 from .http import (
+    HTTPAuthorizationCredentials,
     HTTPBasic,
+    HTTPBasicCredentials,
     HTTPBearer,
     HTTPDigest,
-    HTTPBasicCredentials,
-    HTTPAuthorizationCredentials,
 )
-from .oauth2 import OAuth2PasswordRequestForm, OAuth2, OAuth2PasswordBearer
+from .oauth2 import OAuth2, OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from .open_id_connect_url import OpenIdConnect

diff --git a/scripts/lint.sh b/scripts/lint.sh
index 0d268800af659fdb25a4dd5ad5269c340137d0f7..c11eaf749483b5284f30fb24dd69fe71917403dc 100644 (file)
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -3,4 +3,4 @@ set -x
 
 autoflake --remove-all-unused-imports --recursive --remove-unused-variables --in-place docs/src/ fastapi tests --exclude=__init__.py
 black fastapi tests docs/src
-isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --apply fastapi tests docs/src
+isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --thirdparty fastapi --apply fastapi tests docs/src

diff --git a/scripts/test.sh b/scripts/test.sh
index a9b912bbebbb2f19458ae0d82af2fcfa645c2fee..2e54570759c57e3dad85d906817b0f7e876a9503 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -19,4 +19,4 @@ if [ "${PYTHON_VERSION}" = '3.7' ]; then
 else
     black fastapi tests --check
 fi
-isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --check-only fastapi tests
+isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --check-only --thirdparty fastapi fastapi tests