sort imports and rebase with upstream

Author: sinscary

src/pip/_internal/build_env.py

@@ -16,10 +16,10 @@
 from pip._vendor.pkg_resources import Requirement, VersionConflict, WorkingSet
 
 from pip import __file__ as pip_location
-from pip._internal.utils.subprocess import call_subprocess
+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

@@ -21,14 +21,14 @@
 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
 from pip._internal.models.index import PyPI
 from pip._internal.models.target_python import TargetPython
 from pip._internal.utils.hashes import STRONG_HASHES
 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
 

tests/unit/test_utils.py

@@ -16,6 +16,7 @@
 import pytest
 from mock import Mock, patch
 
+from pip._internal.cli.spinners import SpinnerInterface
 from pip._internal.exceptions import (
     HashMismatch,
     HashMissing,