Skip to content
This repository was archived by the owner on Nov 3, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Available flags:
* ``--silent-overwrite``: The hook won't fail if it has to change files. It will
just do it.

* ``--force_single_line``: Force each import onto a single line.

The hook supports [isort's configuration files](https://github.com/timothycrosley/isort#configuring-isort) - Please refer to the isort documentation for reference

Development: ``pip install -r requirements-dev.txt``
Expand Down
7 changes: 4 additions & 3 deletions pre_commit_hook/sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ def imports_incorrect(filename):
parser = argparse.ArgumentParser()
parser.add_argument('filenames', nargs='*', help='Filenames to run')
parser.add_argument('--silent-overwrite', action='store_true', dest='silent')
parser.set_defaults(silent=False)
parser.add_argument('--force_single_line', action='store_true', dest='force_single_line')
parser.set_defaults(silent=False, force_single_line=False)
args = parser.parse_args(argv)

return_value = 0
Expand All @@ -21,10 +22,10 @@ def imports_incorrect(filename):
if imports_incorrect(filename) is True:
if args.silent is False:
return_value = 1
isort.SortImports(filename)
isort.SortImports(filename, force_single_line=args.force_single_line)
print('FIXED: {0}'.format(os.path.abspath(filename)))
else:
isort.SortImports(filename)
isort.SortImports(filename, force_single_line=args.force_single_line)
return return_value

if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions tests/sort_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ def test_sort(tmpfiles):
assert main([tmpfiles.join('correct_1.py').strpath]) == 0
assert main([tmpfiles.join('incorrect_1.py').strpath]) == 1
assert main([tmpfiles.join('incorrect_2.py').strpath, '--silent-overwrite']) == 0
assert main([tmpfiles.join('incorrect_2.py').strpath, '--force_single_line']) == 0