Skip to content

Commit

Permalink
Merge branch 'develop' into jtyler/isort-experiment
Browse files Browse the repository at this point in the history
  • Loading branch information
timothycrosley authored May 21, 2019
2 parents f2026a4 + b2f82aa commit 49acf9e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
root = true

[*.py]
max_line_length = 120
max_line_length = 100
indent_style = space
indent_size = 4
ignore_frosted_errors = E103
skip = runtests.py,build
balanced_wrapping = true
not_skip = __init__.py
7 changes: 3 additions & 4 deletions hug/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,10 @@
)
from hug.types import create as type

from hug import (
authentication,
) # isort:skip - must be imported last for defaults to have access to all modules

# The following imports must be imported last; in particular, defaults to have access to all modules
from hug import authentication #isort:skip
from hug import development_runner # isort:skip
from hug import defaults # isort:skip

try: # pragma: no cover - defaulting to uvloop if it is installed
import uvloop
Expand Down

0 comments on commit 49acf9e

Please sign in to comment.