Allow isort v5.x as the default version

pantsbuild · Jul 20, 2020 · 9175808 · 9175808
1 parent 669b5f3
commit 9175808
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -9,5 +9,4 @@ force_grid_wrap=0
 use_parentheses=True
 
 known_first_party=internal_backend,pants,pants_test
-default_section=THIRDPARTY
-not_skip=__init__.py
+default_section=THIRDPARTY
diff --git a/examples/.isort.cfg b/examples/.isort.cfg
@@ -9,5 +9,4 @@ force_grid_wrap=0
 use_parentheses=True
 
 known_first_party=example
-default_section=THIRDPARTY
-not_skip=__init__.py
+default_section=THIRDPARTY
diff --git a/src/python/pants/backend/python/lint/isort/subsystem.py b/src/python/pants/backend/python/lint/isort/subsystem.py
@@ -9,7 +9,7 @@ class Isort(PythonToolBase):
     """The Python import sorter tool (https://timothycrosley.github.io/isort/)."""
 
     options_scope = "isort"
-    default_version = "isort>=4.3.21,<4.4"
+    default_version = "isort>=5.0.0,<6.0"
     default_extra_requirements = ["setuptools<45"]  # NB: `<45` is for Python 2 support
     default_entry_point = "isort.main"
 

diff --git a/src/python/pants/backend/python/rules/coverage.py b/src/python/pants/backend/python/rules/coverage.py
@@ -48,7 +48,6 @@
 from pants.option.global_options import GlobMatchErrorBehavior
 from pants.python.python_setup import PythonSetup
 
-
 """
 An overview: