From eb512ffde3ac2b797d212527365d677ce4daaba5 Mon Sep 17 00:00:00 2001 From: Patrick Labatut Date: Sun, 29 Mar 2020 14:46:33 -0700 Subject: [PATCH] Enable black + isort fbsource linter 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 --- .flake8 | 2 +- dev/linter.sh | 2 +- setup.cfg | 17 +++++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.flake8 b/.flake8 index 13d6d72a..6c3b6d91 100644 --- a/.flake8 +++ b/.flake8 @@ -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 diff --git a/dev/linter.sh b/dev/linter.sh index c5b9b02b..4c30a131 100755 --- a/dev/linter.sh +++ b/dev/linter.sh @@ -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}" diff --git a/setup.cfg b/setup.cfg index fec0140d..7372cc41 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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