Enable isort in pre-commit

Author: pradyunsg

.pre-commit-config.yaml

@@ -18,12 +18,11 @@ repos:
     - id: trailing-whitespace
       exclude: .patch
 
-# TODO: enable when fixed.
-# - repo: https://github.com/timothycrosley/isort
-#   rev: 4.3.21
-#   hooks:
-#     - id: isort
-#       files: \.py$
+- repo: https://github.com/timothycrosley/isort
+  rev: 4.3.21
+  hooks:
+    - id: isort
+      files: \.py$
 
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: v0.720

src/pip/_internal/commands/__init__.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 
 import importlib
-from collections import namedtuple, OrderedDict
+from collections import OrderedDict, namedtuple
 
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 

src/pip/_internal/distributions/__init__.py

@@ -1,6 +1,5 @@
 from pip._internal.distributions.source.legacy import SourceDistribution
 from pip._internal.distributions.wheel import WheelDistribution
-
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/req/__init__.py

@@ -5,12 +5,13 @@
 
 import logging
 
-from .req_install import InstallRequirement
-from .req_set import RequirementSet
-from .req_file import parse_requirements
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
+from .req_file import parse_requirements
+from .req_install import InstallRequirement
+from .req_set import RequirementSet
+
 if MYPY_CHECK_RUNNING:
     from typing import Any, List, Sequence
 

src/pip/_internal/vcs/__init__.py

@@ -2,11 +2,14 @@
 # the vcs package don't need to import deeper than `pip._internal.vcs`.
 # (The test directory and imports protected by MYPY_CHECK_RUNNING may
 # still need to import from a vcs sub-package.)
-from pip._internal.vcs.versioncontrol import (  # noqa: F401
-    RemoteNotFoundError, is_url, make_vcs_requirement_url, vcs,
-)
 # Import all vcs modules to register each VCS in the VcsSupport object.
 import pip._internal.vcs.bazaar
 import pip._internal.vcs.git
 import pip._internal.vcs.mercurial
 import pip._internal.vcs.subversion  # noqa: F401
+from pip._internal.vcs.versioncontrol import (  # noqa: F401
+    RemoteNotFoundError,
+    is_url,
+    make_vcs_requirement_url,
+    vcs,
+)

tasks/__init__.py

@@ -1,5 +1,4 @@
 import invoke
-
 from tools.automation import vendoring
 
 ns = invoke.Collection(vendoring)

tests/data/src/pep517_setup_and_pyproject/setup.py

@@ -1,2 +1,3 @@
 from setuptools import setup
+
 setup(name="dummy", version="0.1")

tests/data/src/pep517_setup_only/setup.py

@@ -1,2 +1,3 @@
 from setuptools import setup
+
 setup(name="dummy", version="0.1")

tests/data/src/pep518_with_namespace_package-1.0/setup.py

@@ -2,7 +2,6 @@
 
 import simple_namespace.module
 
-
 setup(
     name='pep518_with_namespace_package',
     version='1.0',

tests/data/src/simple_namespace/setup.py

@@ -1,6 +1,5 @@
 from setuptools import setup
 
-
 setup(
     name='simple_namespace',
     version='1.0',

tests/lib/__init__.py

@@ -1,14 +1,14 @@
 from __future__ import absolute_import
 
-from contextlib import contextmanager
-from textwrap import dedent
 import os
-import sys
 import re
-import textwrap
-import site
 import shutil
+import site
 import subprocess
+import sys
+import textwrap
+from contextlib import contextmanager
+from textwrap import dedent
 
 import pytest
 from scripttest import FoundDir, TestFileEnvironment

tools/automation/vendoring/__init__.py

@@ -1,11 +1,11 @@
 """"Vendoring script, python 3.5 with requests needed"""
 
-from pathlib import Path
 import os
 import re
 import shutil
 import tarfile
 import zipfile
+from pathlib import Path
 
 import invoke
 import requests