Skip to content

Commit

Permalink
Merge pull request #130 from oasis-open/fix-isort-v5
Browse files Browse the repository at this point in the history
Fix isort v5
  • Loading branch information
emmanvg authored Jul 7, 2020
2 parents 25666e8 + 48312ce commit af2cb0a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions medallion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -16,7 +16,7 @@ commands =

passenv = CI TRAVIS TRAVIS_*

[testenv:pycodestyle]
[testenv:style]
deps =
flake8
commands =
Expand All @@ -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 =
Expand All @@ -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

0 comments on commit af2cb0a

Please sign in to comment.