diff --git a/.isort.cfg b/.isort.cfg index 437fb830..44600794 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,8 +1,5 @@ [settings] -check=1 -diff=1 known_third_party=bson,flask,flask_httpauth,jwt,pymongo,pytest,pytz,six,werkzeug known_first_party=medallion -not_skip=__init__.py force_sort_within_sections=1 multi_line_output=5 diff --git a/medallion/__init__.py b/medallion/__init__.py index 7dffd894..e7fba275 100644 --- a/medallion/__init__.py +++ b/medallion/__init__.py @@ -80,10 +80,7 @@ def connect_to_backend(config_info): def register_blueprints(flask_application_instance): - from medallion.views import collections - from medallion.views import discovery - from medallion.views import manifest - from medallion.views import objects + from medallion.views import collections, discovery, manifest, objects with flask_application_instance.app_context(): log.debug("Registering medallion blueprints into {}".format(current_app)) diff --git a/tox.ini b/tox.ini index 7d97bf11..96725362 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35,py36,py37,py38,pycodestyle,isort-check,packaging +envlist = py35,py36,py37,py38,style,isort-check,packaging [testenv] deps = @@ -16,7 +16,7 @@ commands = passenv = CI TRAVIS TRAVIS_* -[testenv:pycodestyle] +[testenv:style] deps = flake8 commands = @@ -31,8 +31,8 @@ max-line-length=160 [testenv:isort-check] deps = isort commands = - isort -rc medallion -df - isort -rc medallion -c + isort medallion --df + isort medallion -c [testenv:packaging] deps = @@ -42,7 +42,7 @@ commands = [travis] python = - 3.5: py35, pycodestyle - 3.6: py36, pycodestyle, isort-check, packaging - 3.7: py37, pycodestyle - 3.8: py38, pycodestyle + 3.5: py35 + 3.6: py36 + 3.7: py37 + 3.8: py38, style, isort-check, packaging