sort imports and rebase with upstream

src/pip/_internal/build_env.py

@@ -12,10 +12,10 @@
 from pip._vendor.pkg_resources import Requirement, VersionConflict, WorkingSet
 
 from pip import __file__ as pip_location
+from pip._internal.cli.spinners import open_spinner
 from pip._internal.utils.misc import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.cli.spinners import open_spinner
 
 if MYPY_CHECK_RUNNING:
     from typing import Tuple, Set, Iterable, Optional, List

src/pip/_internal/cli/cmdoptions.py

@@ -17,6 +17,7 @@
 from optparse import SUPPRESS_HELP, Option, OptionGroup
 from textwrap import dedent
 
+from pip._internal.cli.progress_bars import BAR_TYPES
 from pip._internal.exceptions import CommandError
 from pip._internal.locations import USER_CACHE_DIR, get_src_prefix
 from pip._internal.models.format_control import FormatControl
@@ -26,7 +27,6 @@
 from pip._internal.utils.hashes import STRONG_HASHES
 from pip._internal.utils.misc import redact_password_from_url
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.cli.progress_bars import BAR_TYPES
 
 if MYPY_CHECK_RUNNING:
     from typing import Any, Callable, Dict, Optional, Tuple

src/pip/_internal/cli/spinners.py

@@ -11,6 +11,7 @@
 from pip._internal.utils.compat import WINDOWS
 from pip._internal.utils.logging import get_indentation
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+
 if MYPY_CHECK_RUNNING:
     from typing import Iterator, IO
 

src/pip/_internal/download.py

@@ -27,6 +27,7 @@
 from pip._vendor.six.moves.urllib import request as urllib_request
 
 import pip
+from pip._internal.cli.progress_bars import DownloadProgressProvider
 from pip._internal.exceptions import HashMismatch, InstallationError
 from pip._internal.models.index import PyPI
 # Import ssl from compat so the initial import occurs in only one place.
@@ -43,7 +44,6 @@
 )
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.cli.progress_bars import DownloadProgressProvider
 from pip._internal.vcs import vcs
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/wheel.py

@@ -23,6 +23,7 @@
 from pip._vendor.six import StringIO
 
 from pip._internal import pep425tags
+from pip._internal.cli.spinners import open_spinner
 from pip._internal.download import unpack_url
 from pip._internal.exceptions import (
     InstallationError, InvalidWheelFilename, UnsupportedWheel,
@@ -38,7 +39,6 @@
 from pip._internal.utils.setuptools_build import make_setuptools_shim_args
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.cli.spinners import open_spinner
 
 if MYPY_CHECK_RUNNING:
     from typing import (

tests/unit/test_utils.py

@@ -22,6 +22,7 @@
 from mock import Mock, patch
 from pip._vendor.six.moves.urllib import request as urllib_request
 
+from pip._internal.cli.spinners import SpinnerInterface
 from pip._internal.exceptions import (
     HashMismatch, HashMissing, InstallationError,
 )
@@ -41,7 +42,6 @@
 )
 from pip._internal.utils.setuptools_build import make_setuptools_shim_args
 from pip._internal.utils.temp_dir import AdjacentTempDirectory, TempDirectory
-from pip._internal.cli.spinners import SpinnerInterface
 
 
 class Tests_EgglinkPath: