Skip to content

Commit

Permalink
fix conflicts black and isort
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Yelizariev committed Feb 11, 2020
1 parent 04afccd commit be7630c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
[settings]
; see https://github.com/psf/black
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
combine_as_imports=True
use_parentheses=True
line_length=88
sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
known_third_party = github,oca_dependencies2configs,plumbum,yaml
5 changes: 3 additions & 2 deletions workflow-files/fork2repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
import sys

import yaml
# TODO: make a python package, say dinarlib, to use local imports
from oca_dependencies2configs import main as oca_deps2configs
from oca_dependencies2configs import ( # TODO: make a python package, say dinarlib, to use local imports
main as oca_deps2configs,
)
from plumbum import FG
from plumbum.cmd import cp, git, mkdir

Expand Down

0 comments on commit be7630c

Please sign in to comment.