Skip to content

Commit

Permalink
Enable black + isort fbsource linter
Browse files Browse the repository at this point in the history
Summary:
Enable `black` + `isort` (via `pyfmt`) i.e. `BLACK` fbsource linter.

NOTE: the `BLACK` fbsource linter (and `black` itself) is (by design) ***not*** configurable. This forces aligning the existing options used by the tools invoked in `dev/linter.sh` (for 3rd party developers) with `BLACK` fbsource linting. Without this reconciliation, the different linters (used internally or by 3rd party developers) would simply conflict with each other resulting in artificial back-and-forth changes (for instance line width which `BLACK` forces to 88 characters).

Reviewed By: nikhilaravi

Differential Revision: D20558374

fbshipit-source-id: 614fa00664f8eb9d2de7438c29b807dfbf36ad20
  • Loading branch information
patricklabatut authored and facebook-github-bot committed Mar 29, 2020
1 parent 37c5c8e commit eb512ff
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
ignore = E203, E266, E501, W503, E221
max-line-length = 80
max-line-length = 88
max-complexity = 18
select = B,C,E,F,W,T4,B9
exclude = build,__init__.py
2 changes: 1 addition & 1 deletion dev/linter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ echo "Running isort..."
isort -y -sp "${DIR}"

echo "Running black..."
black -l 80 "${DIR}"
black "${DIR}"

echo "Running flake..."
flake8 "${DIR}"
Expand Down
17 changes: 7 additions & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.

[isort]
line_length=80
include_trailing_comma=True
multi_line_output=3
known_standard_library=numpy,setuptools
known_myself=pytorch3d
known_third_party=fvcore,torch,torchvision,matplotlib,mpl_toolkits,PIL,yaml
jinja2,requests,nbformat,nbconvert,bs4
no_lines_before=STDLIB,THIRDPARTY
sections=FUTURE,STDLIB,THIRDPARTY,myself,FIRSTPARTY,LOCALFOLDER
default_section=FIRSTPARTY
line_length = 88
multi_line_output = 3
include_trailing_comma = True
force_grid_warp = 0
default_section = THIRDPARTY
lines_after_imports = 2
combine_as_imports = True

0 comments on commit eb512ff

Please sign in to comment.