diff --git a/pip/basecommand.py b/pip/basecommand.py index e88c7c57a..94d43e2e6 100644 --- a/pip/basecommand.py +++ b/pip/basecommand.py @@ -3,29 +3,29 @@ from __future__ import absolute_import import logging import logging.config +import optparse import os import sys -import optparse import warnings from pip import cmdoptions +from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter +from pip.download import PipSession +from pip.exceptions import ( + BadCommand, CommandError, InstallationError, PreviousBuildDirError, + UninstallationError +) from pip.index import PackageFinder from pip.locations import running_under_virtualenv -from pip.download import PipSession -from pip.exceptions import (BadCommand, InstallationError, UninstallationError, - CommandError, PreviousBuildDirError) - -from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter from pip.req import InstallRequirement, parse_requirements from pip.status_codes import ( - SUCCESS, ERROR, UNKNOWN_ERROR, VIRTUALENV_NOT_FOUND, - PREVIOUS_BUILD_DIR_ERROR, + ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR, + VIRTUALENV_NOT_FOUND ) from pip.utils import deprecation, get_prog, normalize_path from pip.utils.logging import IndentingFormatter from pip.utils.outdated import pip_version_check - __all__ = ['Command'] diff --git a/pip/baseparser.py b/pip/baseparser.py index 6d304d1bc..2d0c260db 100644 --- a/pip/baseparser.py +++ b/pip/baseparser.py @@ -1,12 +1,13 @@ """Base option parser setup""" from __future__ import absolute_import -import sys import optparse +import sys import textwrap from distutils.util import strtobool from pip._vendor.six import string_types + from pip.configuration import Configuration from pip.utils import get_terminal_size diff --git a/pip/cmdoptions.py b/pip/cmdoptions.py index 494be4db4..3f9db5ba5 100644 --- a/pip/cmdoptions.py +++ b/pip/cmdoptions.py @@ -9,15 +9,15 @@ pass on state. To be consistent, all options will follow this design. """ from __future__ import absolute_import -from functools import partial -from optparse import OptionGroup, SUPPRESS_HELP, Option import warnings +from functools import partial +from optparse import SUPPRESS_HELP, Option, OptionGroup from pip.index import ( - FormatControl, fmt_ctl_handle_mutual_exclude, fmt_ctl_no_binary, + FormatControl, fmt_ctl_handle_mutual_exclude, fmt_ctl_no_binary ) -from pip.models import PyPI from pip.locations import USER_CACHE_DIR, src_prefix +from pip.models import PyPI from pip.utils.hashes import STRONG_HASHES from pip.utils.ui import BAR_TYPES diff --git a/pip/commands/check.py b/pip/commands/check.py index fec858875..d951f8e87 100644 --- a/pip/commands/check.py +++ b/pip/commands/check.py @@ -4,7 +4,6 @@ from pip.basecommand import Command from pip.operations.check import check_requirements from pip.utils import get_installed_distributions - logger = logging.getLogger(__name__) diff --git a/pip/commands/completion.py b/pip/commands/completion.py index 9d79d607e..ee1baf326 100644 --- a/pip/commands/completion.py +++ b/pip/commands/completion.py @@ -1,6 +1,7 @@ from __future__ import absolute_import import sys + from pip.basecommand import Command BASE_COMPLETION = """ diff --git a/pip/commands/download.py b/pip/commands/download.py index 26b6e5f2e..97ec307d7 100644 --- a/pip/commands/download.py +++ b/pip/commands/download.py @@ -3,16 +3,15 @@ from __future__ import absolute_import import logging import os +from pip import cmdoptions +from pip.basecommand import RequirementCommand from pip.exceptions import CommandError from pip.index import FormatControl from pip.req import RequirementSet -from pip.basecommand import RequirementCommand -from pip import cmdoptions from pip.utils import ensure_dir, normalize_path from pip.utils.build import BuildDirectory from pip.utils.filesystem import check_path_owner - logger = logging.getLogger(__name__) diff --git a/pip/commands/freeze.py b/pip/commands/freeze.py index 133ee397f..2f9abd883 100644 --- a/pip/commands/freeze.py +++ b/pip/commands/freeze.py @@ -3,12 +3,11 @@ from __future__ import absolute_import import sys import pip -from pip.compat import stdlib_pkgs from pip.basecommand import Command +from pip.compat import stdlib_pkgs from pip.operations.freeze import freeze from pip.wheel import WheelCache - DEV_PKGS = {'pip', 'setuptools', 'distribute', 'wheel'} diff --git a/pip/commands/hash.py b/pip/commands/hash.py index 27cca0bfa..a2341a914 100644 --- a/pip/commands/hash.py +++ b/pip/commands/hash.py @@ -9,7 +9,6 @@ from pip.status_codes import ERROR from pip.utils import read_chunks from pip.utils.hashes import FAVORITE_HASH, STRONG_HASHES - logger = logging.getLogger(__name__) diff --git a/pip/commands/help.py b/pip/commands/help.py index 11722f1e0..77664729f 100644 --- a/pip/commands/help.py +++ b/pip/commands/help.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from pip.basecommand import Command, SUCCESS +from pip.basecommand import SUCCESS, Command from pip.exceptions import CommandError diff --git a/pip/commands/install.py b/pip/commands/install.py index a49dfa786..433400f0f 100644 --- a/pip/commands/install.py +++ b/pip/commands/install.py @@ -3,25 +3,26 @@ from __future__ import absolute_import import logging import operator import os -import tempfile import shutil +import tempfile + +from pip import cmdoptions +from pip.basecommand import RequirementCommand +from pip.exceptions import ( + CommandError, InstallationError, PreviousBuildDirError +) +from pip.locations import distutils_scheme, virtualenv_no_global +from pip.req import RequirementSet +from pip.utils import ensure_dir, get_installed_version +from pip.utils.build import BuildDirectory +from pip.utils.filesystem import check_path_owner +from pip.wheel import WheelBuilder, WheelCache + try: import wheel except ImportError: wheel = None -from pip.req import RequirementSet -from pip.basecommand import RequirementCommand -from pip.locations import virtualenv_no_global, distutils_scheme -from pip.exceptions import ( - InstallationError, CommandError, PreviousBuildDirError, -) -from pip import cmdoptions -from pip.utils import ensure_dir, get_installed_version -from pip.utils.build import BuildDirectory -from pip.utils.filesystem import check_path_owner -from pip.wheel import WheelCache, WheelBuilder - logger = logging.getLogger(__name__) diff --git a/pip/commands/list.py b/pip/commands/list.py index 2758626e0..2891362f5 100644 --- a/pip/commands/list.py +++ b/pip/commands/list.py @@ -3,21 +3,22 @@ from __future__ import absolute_import import json import logging import warnings + +from pip._vendor import six + +from pip.basecommand import Command +from pip.cmdoptions import index_group, make_option_group +from pip.exceptions import CommandError +from pip.index import PackageFinder +from pip.utils import dist_is_editable, get_installed_distributions +from pip.utils.deprecation import RemovedInPip11Warning +from pip.utils.packaging import get_installer + try: from itertools import zip_longest except ImportError: from itertools import izip_longest as zip_longest -from pip._vendor import six - -from pip.basecommand import Command -from pip.exceptions import CommandError -from pip.index import PackageFinder -from pip.utils import ( - get_installed_distributions, dist_is_editable) -from pip.utils.deprecation import RemovedInPip11Warning -from pip.utils.packaging import get_installer -from pip.cmdoptions import make_option_group, index_group logger = logging.getLogger(__name__) diff --git a/pip/commands/search.py b/pip/commands/search.py index e2f0ca5d0..6f23da407 100644 --- a/pip/commands/search.py +++ b/pip/commands/search.py @@ -3,20 +3,19 @@ from __future__ import absolute_import import logging import sys import textwrap - from collections import OrderedDict -from pip.basecommand import Command, SUCCESS -from pip.download import PipXmlrpcTransport -from pip.models import PyPI -from pip.utils import get_terminal_size -from pip.utils.logging import indent_log -from pip.exceptions import CommandError -from pip.status_codes import NO_MATCHES_FOUND -from pip._vendor.packaging.version import parse as parse_version from pip._vendor import pkg_resources +from pip._vendor.packaging.version import parse as parse_version from pip._vendor.six.moves import xmlrpc_client +from pip.basecommand import SUCCESS, Command +from pip.download import PipXmlrpcTransport +from pip.exceptions import CommandError +from pip.models import PyPI +from pip.status_codes import NO_MATCHES_FOUND +from pip.utils import get_terminal_size +from pip.utils.logging import indent_log logger = logging.getLogger(__name__) diff --git a/pip/commands/show.py b/pip/commands/show.py index 111c16d1a..28e57c2c3 100644 --- a/pip/commands/show.py +++ b/pip/commands/show.py @@ -1,14 +1,14 @@ from __future__ import absolute_import -from email.parser import FeedParser import logging import os +from email.parser import FeedParser -from pip.basecommand import Command -from pip.status_codes import SUCCESS, ERROR from pip._vendor import pkg_resources from pip._vendor.packaging.utils import canonicalize_name +from pip.basecommand import Command +from pip.status_codes import ERROR, SUCCESS logger = logging.getLogger(__name__) diff --git a/pip/commands/uninstall.py b/pip/commands/uninstall.py index 130bec958..e12bfa477 100644 --- a/pip/commands/uninstall.py +++ b/pip/commands/uninstall.py @@ -2,9 +2,9 @@ from __future__ import absolute_import from pip._vendor.packaging.utils import canonicalize_name -from pip.req import InstallRequirement, parse_requirements from pip.basecommand import Command from pip.exceptions import InstallationError +from pip.req import InstallRequirement, parse_requirements class UninstallCommand(Command): diff --git a/pip/commands/wheel.py b/pip/commands/wheel.py index a15bcd899..d2fea830e 100644 --- a/pip/commands/wheel.py +++ b/pip/commands/wheel.py @@ -4,14 +4,13 @@ from __future__ import absolute_import import logging import os +from pip import cmdoptions from pip.basecommand import RequirementCommand from pip.exceptions import CommandError, PreviousBuildDirError from pip.req import RequirementSet from pip.utils import import_or_raise from pip.utils.build import BuildDirectory -from pip.wheel import WheelCache, WheelBuilder -from pip import cmdoptions - +from pip.wheel import WheelBuilder, WheelCache logger = logging.getLogger(__name__) diff --git a/pip/configuration.py b/pip/configuration.py index f01e09874..01b68abf1 100644 --- a/pip/configuration.py +++ b/pip/configuration.py @@ -1,18 +1,18 @@ """Configuration management setup """ -import re import os +import re import sys from pip._vendor.six.moves import configparser + from pip.locations import ( - legacy_config_file, config_basename, running_under_virtualenv, + config_basename, legacy_config_file, running_under_virtualenv, site_config_files ) from pip.utils import appdirs - _environ_prefix_re = re.compile(r"^PIP_", re.I) diff --git a/pip/download.py b/pip/download.py index 894d0ff9a..06e07ecb0 100644 --- a/pip/download.py +++ b/pip/download.py @@ -13,44 +13,43 @@ import shutil import sys import tempfile -try: - import ssl # noqa - HAS_TLS = True -except ImportError: - HAS_TLS = False - +from pip._vendor import requests, six +from pip._vendor.cachecontrol import CacheControlAdapter +from pip._vendor.cachecontrol.caches import FileCache +from pip._vendor.lockfile import LockError +from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter +from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth +from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response +from pip._vendor.requests.packages import urllib3 +from pip._vendor.requests.structures import CaseInsensitiveDict +from pip._vendor.requests.utils import get_netrc_auth +from pip._vendor.six.moves import xmlrpc_client from pip._vendor.six.moves.urllib import parse as urllib_parse from pip._vendor.six.moves.urllib import request as urllib_request from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote import pip - -from pip.exceptions import InstallationError, HashMismatch +from pip.exceptions import HashMismatch, InstallationError +from pip.locations import write_delete_marker_file from pip.models import PyPI -from pip.utils import (splitext, rmtree, format_size, display_path, - backup_dir, ask_path_exists, unpack_file, - ARCHIVE_EXTENSIONS, consume, call_subprocess, - get_installed_version) +from pip.utils import ( + ARCHIVE_EXTENSIONS, ask_path_exists, backup_dir, call_subprocess, consume, + display_path, format_size, get_installed_version, rmtree, splitext, + unpack_file +) from pip.utils.encoding import auto_decode from pip.utils.filesystem import check_path_owner +from pip.utils.glibc import libc_ver from pip.utils.logging import indent_log from pip.utils.setuptools_build import SETUPTOOLS_SHIM -from pip.utils.glibc import libc_ver from pip.utils.ui import DownloadProgressProvider -from pip.locations import write_delete_marker_file from pip.vcs import vcs -from pip._vendor import requests, six -from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter -from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth -from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response -from pip._vendor.requests.utils import get_netrc_auth -from pip._vendor.requests.structures import CaseInsensitiveDict -from pip._vendor.requests.packages import urllib3 -from pip._vendor.cachecontrol import CacheControlAdapter -from pip._vendor.cachecontrol.caches import FileCache -from pip._vendor.lockfile import LockError -from pip._vendor.six.moves import xmlrpc_client +try: + import ssl # noqa + HAS_TLS = True +except ImportError: + HAS_TLS = False __all__ = ['get_file_content', 'is_url', 'url_to_path', 'path_to_url', diff --git a/pip/index.py b/pip/index.py index 83f6a39a6..65d98992a 100644 --- a/pip/index.py +++ b/pip/index.py @@ -1,42 +1,41 @@ """Routines related to PyPI, indexes""" from __future__ import absolute_import -import logging import cgi -from collections import namedtuple import itertools -import sys -import os -import re +import logging import mimetypes +import os import posixpath +import re +import sys import warnings +from collections import namedtuple +from pip._vendor import html5lib, requests, six +from pip._vendor.distlib.compat import unescape +from pip._vendor.packaging import specifiers +from pip._vendor.packaging.utils import canonicalize_name +from pip._vendor.packaging.version import parse as parse_version +from pip._vendor.requests.exceptions import SSLError from pip._vendor.six.moves.urllib import parse as urllib_parse from pip._vendor.six.moves.urllib import request as urllib_request from pip.compat import ipaddress +from pip.download import HAS_TLS, is_url, path_to_url, url_to_path +from pip.exceptions import ( + BestVersionAlreadyInstalled, DistributionNotFound, InvalidWheelFilename, + UnsupportedWheel +) +from pip.pep425tags import get_supported from pip.utils import ( - cached_property, splitext, normalize_path, - ARCHIVE_EXTENSIONS, SUPPORTED_EXTENSIONS, + ARCHIVE_EXTENSIONS, SUPPORTED_EXTENSIONS, cached_property, normalize_path, + splitext ) from pip.utils.deprecation import RemovedInPip11Warning from pip.utils.logging import indent_log from pip.utils.packaging import check_requires_python -from pip.exceptions import ( - DistributionNotFound, BestVersionAlreadyInstalled, InvalidWheelFilename, - UnsupportedWheel, -) -from pip.download import HAS_TLS, is_url, path_to_url, url_to_path from pip.wheel import Wheel, wheel_ext -from pip.pep425tags import get_supported -from pip._vendor import html5lib, requests, six -from pip._vendor.packaging.version import parse as parse_version -from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.packaging import specifiers -from pip._vendor.requests.exceptions import SSLError -from pip._vendor.distlib.compat import unescape - __all__ = ['FormatControl', 'fmt_ctl_handle_mutual_exclude', 'PackageFinder'] diff --git a/pip/locations.py b/pip/locations.py index a3478aee6..1b5738344 100644 --- a/pip/locations.py +++ b/pip/locations.py @@ -7,14 +7,12 @@ import platform import site import sys import sysconfig - from distutils import sysconfig as distutils_sysconfig -from distutils.command.install import install, SCHEME_KEYS # noqa +from distutils.command.install import SCHEME_KEYS, install # noqa from pip.compat import WINDOWS, expanduser from pip.utils import appdirs - # Application Directories USER_CACHE_DIR = appdirs.user_cache_dir("pip") diff --git a/pip/operations/freeze.py b/pip/operations/freeze.py index 9ed3564de..6772022fd 100644 --- a/pip/operations/freeze.py +++ b/pip/operations/freeze.py @@ -5,15 +5,15 @@ import os import re import warnings -from pip.exceptions import InstallationError -from pip.req import InstallRequirement -from pip.req.req_file import COMMENT_RE -from pip.utils import get_installed_distributions, dist_is_editable -from pip.utils.deprecation import RemovedInPip11Warning from pip._vendor import pkg_resources from pip._vendor.packaging.utils import canonicalize_name from pip._vendor.pkg_resources import RequirementParseError +from pip.exceptions import InstallationError +from pip.req import InstallRequirement +from pip.req.req_file import COMMENT_RE +from pip.utils import dist_is_editable, get_installed_distributions +from pip.utils.deprecation import RemovedInPip11Warning logger = logging.getLogger(__name__) diff --git a/pip/pep425tags.py b/pip/pep425tags.py index 1278e0f63..e33b6ce0e 100644 --- a/pip/pep425tags.py +++ b/pip/pep425tags.py @@ -2,13 +2,12 @@ from __future__ import absolute_import import distutils.util +import logging +import platform import re import sys import sysconfig import warnings -import platform -import logging - from collections import OrderedDict import pip.utils.glibc diff --git a/pip/req/req_file.py b/pip/req/req_file.py index caa3527ca..8231c456f 100644 --- a/pip/req/req_file.py +++ b/pip/req/req_file.py @@ -4,19 +4,19 @@ Requirements file parsing from __future__ import absolute_import +import optparse import os import re import shlex import sys -import optparse -from pip._vendor.six.moves.urllib import parse as urllib_parse from pip._vendor.six.moves import filterfalse +from pip._vendor.six.moves.urllib import parse as urllib_parse -from pip.download import get_file_content -from pip.req.req_install import InstallRequirement -from pip.exceptions import (RequirementsFileParseError) from pip import cmdoptions +from pip.download import get_file_content +from pip.exceptions import RequirementsFileParseError +from pip.req.req_install import InstallRequirement __all__ = ['parse_requirements'] diff --git a/pip/req/req_install.py b/pip/req/req_install.py index 6c7fe4f75..86f4c550e 100644 --- a/pip/req/req_install.py +++ b/pip/req/req_install.py @@ -10,7 +10,6 @@ import tempfile import traceback import warnings import zipfile - from distutils.util import change_root from email.parser import FeedParser @@ -19,36 +18,28 @@ from pip._vendor.packaging import specifiers from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import InvalidRequirement, Requirement from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.packaging.version import Version, parse as parse_version -from pip._vendor.pkg_resources import parse_requirements, RequirementParseError - +from pip._vendor.packaging.version import parse as parse_version +from pip._vendor.packaging.version import Version +from pip._vendor.pkg_resources import RequirementParseError, parse_requirements import pip.wheel - from pip.compat import native_str -from pip.download import is_url, url_to_path, path_to_url, is_archive_file -from pip.exceptions import ( - InstallationError, UninstallationError, -) -from pip.locations import ( - running_under_virtualenv, PIP_DELETE_MARKER_FILENAME, -) +from pip.download import is_archive_file, is_url, path_to_url, url_to_path +from pip.exceptions import InstallationError, UninstallationError +from pip.locations import PIP_DELETE_MARKER_FILENAME, running_under_virtualenv +from pip.req.req_uninstall import UninstallPathSet from pip.utils import ( - display_path, rmtree, ask_path_exists, backup_dir, is_installable_dir, - dist_in_usersite, dist_in_site_packages, - call_subprocess, read_text_file, _make_build_dir, ensure_dir, - get_installed_version, + _make_build_dir, ask_path_exists, backup_dir, call_subprocess, + display_path, dist_in_site_packages, dist_in_usersite, ensure_dir, + get_installed_version, is_installable_dir, read_text_file, rmtree ) - -from pip.utils.hashes import Hashes from pip.utils.deprecation import RemovedInPip11Warning +from pip.utils.hashes import Hashes from pip.utils.logging import indent_log from pip.utils.setuptools_build import SETUPTOOLS_SHIM from pip.utils.ui import open_spinner -from pip.req.req_uninstall import UninstallPathSet from pip.vcs import vcs -from pip.wheel import move_wheel_files, Wheel - +from pip.wheel import Wheel, move_wheel_files logger = logging.getLogger(__name__) diff --git a/pip/req/req_set.py b/pip/req/req_set.py index 119a83dca..dfb372d66 100644 --- a/pip/req/req_set.py +++ b/pip/req/req_set.py @@ -1,24 +1,26 @@ from __future__ import absolute_import -from collections import defaultdict -from itertools import chain import logging import os +from collections import defaultdict +from itertools import chain -from pip._vendor import pkg_resources -from pip._vendor import requests +from pip._vendor import pkg_resources, requests from pip.compat import expanduser -from pip.download import (is_file_url, is_dir_url, is_vcs_url, url_to_path, - unpack_url) -from pip.exceptions import (InstallationError, BestVersionAlreadyInstalled, - DistributionNotFound, PreviousBuildDirError, - HashError, HashErrors, HashUnpinned, - DirectoryUrlHashUnsupported, VcsHashUnsupported, - UnsupportedPythonVersion) +from pip.download import ( + is_dir_url, is_file_url, is_vcs_url, unpack_url, url_to_path +) +from pip.exceptions import ( + BestVersionAlreadyInstalled, DirectoryUrlHashUnsupported, + DistributionNotFound, HashError, HashErrors, HashUnpinned, + InstallationError, PreviousBuildDirError, UnsupportedPythonVersion, + VcsHashUnsupported +) from pip.req.req_install import InstallRequirement from pip.utils import ( - display_path, dist_in_usersite, ensure_dir, normalize_path) + display_path, dist_in_usersite, ensure_dir, normalize_path +) from pip.utils.hashes import MissingHashes from pip.utils.logging import indent_log from pip.utils.packaging import check_dist_requires_python diff --git a/pip/req/req_uninstall.py b/pip/req/req_uninstall.py index 39809fe0b..49fbc4540 100644 --- a/pip/req/req_uninstall.py +++ b/pip/req/req_uninstall.py @@ -10,19 +10,15 @@ import tempfile from pip._vendor import pkg_resources -from pip.compat import uses_pycache, WINDOWS, cache_from_source +from pip.compat import WINDOWS, cache_from_source, uses_pycache from pip.exceptions import UninstallationError -from pip.locations import ( - bin_py, bin_user, -) +from pip.locations import bin_py, bin_user from pip.utils import ( - rmtree, ask, dist_in_usersite, is_local, - egg_link_path, FakeFile, - renames, normalize_path, dist_is_local, + FakeFile, ask, dist_in_usersite, dist_is_local, egg_link_path, is_local, + normalize_path, renames, rmtree ) from pip.utils.logging import indent_log - logger = logging.getLogger(__name__) diff --git a/pip/utils/appdirs.py b/pip/utils/appdirs.py index d41102cef..62f511eb9 100644 --- a/pip/utils/appdirs.py +++ b/pip/utils/appdirs.py @@ -7,9 +7,10 @@ from __future__ import absolute_import import os import sys -from pip.compat import WINDOWS, expanduser from pip._vendor.six import PY2, text_type +from pip.compat import WINDOWS, expanduser + def user_cache_dir(appname): r""" diff --git a/pip/utils/encoding.py b/pip/utils/encoding.py index f1f3a4a67..f308878bf 100644 --- a/pip/utils/encoding.py +++ b/pip/utils/encoding.py @@ -2,7 +2,6 @@ import codecs import locale import re - BOMS = [ (codecs.BOM_UTF8, 'utf8'), (codecs.BOM_UTF16, 'utf16'), diff --git a/pip/utils/glibc.py b/pip/utils/glibc.py index 7847885c4..d98e4fc99 100644 --- a/pip/utils/glibc.py +++ b/pip/utils/glibc.py @@ -1,8 +1,8 @@ from __future__ import absolute_import -import re import ctypes import platform +import re import warnings diff --git a/pip/utils/hashes.py b/pip/utils/hashes.py index 960297007..9a3e37b36 100644 --- a/pip/utils/hashes.py +++ b/pip/utils/hashes.py @@ -2,10 +2,10 @@ from __future__ import absolute_import import hashlib -from pip.exceptions import HashMismatch, HashMissing, InstallationError -from pip.utils import read_chunks from pip._vendor.six import iteritems, iterkeys, itervalues +from pip.exceptions import HashMismatch, HashMissing, InstallationError +from pip.utils import read_chunks # The recommended hash algo of the moment. Change this whenever the state of # the art changes; it won't hurt backward compatibility. diff --git a/pip/utils/logging.py b/pip/utils/logging.py index 1c1053abf..b2bc022ba 100644 --- a/pip/utils/logging.py +++ b/pip/utils/logging.py @@ -5,13 +5,14 @@ import logging import logging.handlers import os +from pip.compat import WINDOWS +from pip.utils import ensure_dir + try: import threading except ImportError: import dummy_threading as threading -from pip.compat import WINDOWS -from pip.utils import ensure_dir try: from pip._vendor import colorama diff --git a/pip/utils/outdated.py b/pip/utils/outdated.py index bf6ff3fa7..517d3bc9a 100644 --- a/pip/utils/outdated.py +++ b/pip/utils/outdated.py @@ -15,7 +15,6 @@ from pip.locations import USER_CACHE_DIR, running_under_virtualenv from pip.utils import ensure_dir, get_installed_version from pip.utils.filesystem import check_path_owner - SELFCHECK_DATE_FMT = "%Y-%m-%dT%H:%M:%SZ" diff --git a/pip/utils/packaging.py b/pip/utils/packaging.py index 5464dd133..e789d45e6 100644 --- a/pip/utils/packaging.py +++ b/pip/utils/packaging.py @@ -1,13 +1,11 @@ from __future__ import absolute_import -from email.parser import FeedParser - import logging import sys +from email.parser import FeedParser -from pip._vendor.packaging import specifiers -from pip._vendor.packaging import version from pip._vendor import pkg_resources +from pip._vendor.packaging import specifiers, version from pip import exceptions diff --git a/pip/utils/ui.py b/pip/utils/ui.py index 3dae81109..10f57f0e2 100644 --- a/pip/utils/ui.py +++ b/pip/utils/ui.py @@ -1,25 +1,23 @@ -from __future__ import absolute_import -from __future__ import division +from __future__ import absolute_import, division -import itertools -import sys -from signal import signal, SIGINT, default_int_handler -import time import contextlib +import itertools import logging +import sys +import time +from signal import SIGINT, default_int_handler, signal + +from pip._vendor import six +from pip._vendor.progress.bar import ( + Bar, ChargingBar, FillingCirclesBar, FillingSquaresBar, IncrementalBar, + ShadyBar +) +from pip._vendor.progress.helpers import HIDE_CURSOR, SHOW_CURSOR, WritelnMixin +from pip._vendor.progress.spinner import Spinner from pip.compat import WINDOWS from pip.utils import format_size from pip.utils.logging import get_indentation -from pip._vendor import six - -from pip._vendor.progress.bar import Bar, IncrementalBar -from pip._vendor.progress.bar import FillingCirclesBar, FillingSquaresBar -from pip._vendor.progress.bar import ChargingBar, ShadyBar - -from pip._vendor.progress.helpers import (WritelnMixin, - HIDE_CURSOR, SHOW_CURSOR) -from pip._vendor.progress.spinner import Spinner try: from pip._vendor import colorama diff --git a/pip/vcs/bazaar.py b/pip/vcs/bazaar.py index 0f095841d..eda3c2599 100644 --- a/pip/vcs/bazaar.py +++ b/pip/vcs/bazaar.py @@ -4,16 +4,16 @@ import logging import os import tempfile +from pip.download import path_to_url +from pip.utils import display_path, rmtree +from pip.vcs import VersionControl, vcs + # TODO: Get this into six.moves.urllib.parse try: from urllib import parse as urllib_parse except ImportError: import urlparse as urllib_parse -from pip.utils import rmtree, display_path -from pip.vcs import vcs, VersionControl -from pip.download import path_to_url - logger = logging.getLogger(__name__) diff --git a/pip/vcs/git.py b/pip/vcs/git.py index e2f6c6e07..aba48014c 100644 --- a/pip/vcs/git.py +++ b/pip/vcs/git.py @@ -1,18 +1,17 @@ from __future__ import absolute_import import logging -import tempfile import os.path +import tempfile + +from pip._vendor.packaging.version import parse as parse_version +from pip._vendor.six.moves.urllib import parse as urllib_parse +from pip._vendor.six.moves.urllib import request as urllib_request from pip.compat import samefile from pip.exceptions import BadCommand -from pip._vendor.six.moves.urllib import parse as urllib_parse -from pip._vendor.six.moves.urllib import request as urllib_request -from pip._vendor.packaging.version import parse as parse_version - from pip.utils import display_path, rmtree -from pip.vcs import vcs, VersionControl - +from pip.vcs import VersionControl, vcs urlsplit = urllib_parse.urlsplit urlunsplit = urllib_parse.urlunsplit diff --git a/pip/vcs/mercurial.py b/pip/vcs/mercurial.py index 1aa83b914..6f3c9af5c 100644 --- a/pip/vcs/mercurial.py +++ b/pip/vcs/mercurial.py @@ -4,11 +4,11 @@ import logging import os import tempfile -from pip.utils import display_path, rmtree -from pip.vcs import vcs, VersionControl -from pip.download import path_to_url from pip._vendor.six.moves import configparser +from pip.download import path_to_url +from pip.utils import display_path, rmtree +from pip.vcs import VersionControl, vcs logger = logging.getLogger(__name__) diff --git a/pip/vcs/subversion.py b/pip/vcs/subversion.py index d0de50580..77b66c91e 100644 --- a/pip/vcs/subversion.py +++ b/pip/vcs/subversion.py @@ -7,9 +7,9 @@ import re from pip._vendor.six.moves.urllib import parse as urllib_parse from pip.index import Link -from pip.utils import rmtree, display_path +from pip.utils import display_path, rmtree from pip.utils.logging import indent_log -from pip.vcs import vcs, VersionControl +from pip.vcs import VersionControl, vcs _svn_xml_url_re = re.compile('url="([^"]+)"') _svn_rev_re = re.compile(r'committed-rev="(\d+)"') diff --git a/pip/wheel.py b/pip/wheel.py index 1a3660478..8abe958de 100644 --- a/pip/wheel.py +++ b/pip/wheel.py @@ -16,29 +16,28 @@ import stat import sys import tempfile import warnings - from base64 import urlsafe_b64encode from email.parser import Parser +from pip._vendor import pkg_resources +from pip._vendor.distlib.scripts import ScriptMaker +from pip._vendor.packaging.utils import canonicalize_name from pip._vendor.six import StringIO import pip +from pip import pep425tags from pip.compat import expanduser from pip.download import path_to_url, unpack_url from pip.exceptions import ( - InstallationError, InvalidWheelFilename, UnsupportedWheel) -from pip.locations import distutils_scheme, PIP_DELETE_MARKER_FILENAME -from pip import pep425tags -from pip.utils import ( - call_subprocess, ensure_dir, captured_stdout, rmtree, read_chunks, + InstallationError, InvalidWheelFilename, UnsupportedWheel +) +from pip.locations import PIP_DELETE_MARKER_FILENAME, distutils_scheme +from pip.utils import ( + call_subprocess, captured_stdout, ensure_dir, read_chunks, rmtree ) -from pip.utils.ui import open_spinner from pip.utils.logging import indent_log from pip.utils.setuptools_build import SETUPTOOLS_SHIM -from pip._vendor.distlib.scripts import ScriptMaker -from pip._vendor import pkg_resources -from pip._vendor.packaging.utils import canonicalize_name - +from pip.utils.ui import open_spinner wheel_ext = '.whl' diff --git a/tests/conftest.py b/tests/conftest.py index 2d643df20..94a9677ff 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,13 +3,11 @@ import os import shutil import sys -import pytest - import six import pip +import pytest from pip.utils import appdirs - from tests.lib import SRC_DIR, TestData from tests.lib.path import Path from tests.lib.scripttest import PipTestEnvironment diff --git a/tests/data/packages/BrokenEmitsUTF8/setup.py b/tests/data/packages/BrokenEmitsUTF8/setup.py index 067d580fb..81c5baead 100644 --- a/tests/data/packages/BrokenEmitsUTF8/setup.py +++ b/tests/data/packages/BrokenEmitsUTF8/setup.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from distutils.core import setup import sys +from distutils.core import setup + class FakeError(Exception): pass diff --git a/tests/data/packages/FSPkg/setup.py b/tests/data/packages/FSPkg/setup.py index 1215408c8..44c8ea386 100644 --- a/tests/data/packages/FSPkg/setup.py +++ b/tests/data/packages/FSPkg/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup version = '0.1dev' diff --git a/tests/data/packages/HackedEggInfo/setup.py b/tests/data/packages/HackedEggInfo/setup.py index 4115d96be..171f5a2a3 100644 --- a/tests/data/packages/HackedEggInfo/setup.py +++ b/tests/data/packages/HackedEggInfo/setup.py @@ -3,6 +3,7 @@ from setuptools import setup from setuptools.command import egg_info as orig_egg_info + class egg_info (orig_egg_info.egg_info): def run(self): orig_egg_info.egg_info.run(self) diff --git a/tests/data/packages/LineEndings/setup.py b/tests/data/packages/LineEndings/setup.py index d65ccfb76..5bb4a1123 100644 --- a/tests/data/packages/LineEndings/setup.py +++ b/tests/data/packages/LineEndings/setup.py @@ -1,3 +1,3 @@ -from distutils.core import setup - -setup() +from distutils.core import setup + +setup() diff --git a/tests/data/packages/LocalEnvironMarker/setup.py b/tests/data/packages/LocalEnvironMarker/setup.py index 33338a8e2..00f18d583 100644 --- a/tests/data/packages/LocalEnvironMarker/setup.py +++ b/tests/data/packages/LocalEnvironMarker/setup.py @@ -1,5 +1,6 @@ import os -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def path_to_url(path): diff --git a/tests/data/packages/LocalExtras-0.0.2/setup.py b/tests/data/packages/LocalExtras-0.0.2/setup.py index 4167e1410..acc55f967 100644 --- a/tests/data/packages/LocalExtras-0.0.2/setup.py +++ b/tests/data/packages/LocalExtras-0.0.2/setup.py @@ -1,5 +1,6 @@ import os -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def path_to_url(path): diff --git a/tests/data/packages/LocalExtras/setup.py b/tests/data/packages/LocalExtras/setup.py index 33a2f26c8..f25cc16c6 100644 --- a/tests/data/packages/LocalExtras/setup.py +++ b/tests/data/packages/LocalExtras/setup.py @@ -1,5 +1,6 @@ import os -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def path_to_url(path): diff --git a/tests/data/packages/requires_wheelbroken_upper/setup.py b/tests/data/packages/requires_wheelbroken_upper/setup.py index 255cf2219..150f98dfb 100644 --- a/tests/data/packages/requires_wheelbroken_upper/setup.py +++ b/tests/data/packages/requires_wheelbroken_upper/setup.py @@ -1,4 +1,5 @@ import setuptools + setuptools.setup( name="requires_wheelbroken_upper", version="0", diff --git a/tests/data/src/chattymodule/setup.py b/tests/data/src/chattymodule/setup.py index abc56b161..7211972d1 100644 --- a/tests/data/src/chattymodule/setup.py +++ b/tests/data/src/chattymodule/setup.py @@ -1,9 +1,10 @@ # A chatty setup.py for testing pip subprocess output handling -from setuptools import setup import os import sys +from setuptools import setup + print("HELLO FROM CHATTYMODULE %s" % (sys.argv[1],)) print(os.environ) print(sys.argv) diff --git a/tests/data/src/compilewheel/setup.py b/tests/data/src/compilewheel/setup.py index 46305d226..8319a2a5c 100644 --- a/tests/data/src/compilewheel/setup.py +++ b/tests/data/src/compilewheel/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup(name='compilewheel', version='1.0', diff --git a/tests/data/src/prjwithdatafile/setup.py b/tests/data/src/prjwithdatafile/setup.py index b040adfeb..94863b57b 100755 --- a/tests/data/src/prjwithdatafile/setup.py +++ b/tests/data/src/prjwithdatafile/setup.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- -from setuptools import setup - -setup( - name='prjwithdatafile', - version="1.0", - packages=['prjwithdatafile'], - data_files=[ - (r'packages1', ['prjwithdatafile/README.txt']), - (r'packages2', ['prjwithdatafile/README.txt']) - ] -) +# -*- coding: utf-8 -*- +from setuptools import setup + +setup( + name='prjwithdatafile', + version="1.0", + packages=['prjwithdatafile'], + data_files=[ + (r'packages1', ['prjwithdatafile/README.txt']), + (r'packages2', ['prjwithdatafile/README.txt']) + ] +) diff --git a/tests/data/src/requires_simple/setup.py b/tests/data/src/requires_simple/setup.py index 3f7983b82..57122041a 100644 --- a/tests/data/src/requires_simple/setup.py +++ b/tests/data/src/requires_simple/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup(name='requires_simple', version='0.1', diff --git a/tests/data/src/sample/setup.py b/tests/data/src/sample/setup.py index 8dc8a0660..73172bedc 100644 --- a/tests/data/src/sample/setup.py +++ b/tests/data/src/sample/setup.py @@ -1,8 +1,9 @@ -from setuptools import setup, find_packages import codecs import os import re +from setuptools import find_packages, setup + here = os.path.abspath(os.path.dirname(__file__)) # Read the version number from a source file. diff --git a/tests/data/src/simplewheel-1.0/setup.py b/tests/data/src/simplewheel-1.0/setup.py index 97a2210f0..f54a4502c 100644 --- a/tests/data/src/simplewheel-1.0/setup.py +++ b/tests/data/src/simplewheel-1.0/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup(name='simplewheel', version='1.0', diff --git a/tests/data/src/simplewheel-2.0/setup.py b/tests/data/src/simplewheel-2.0/setup.py index f2b31f6af..e889bb644 100644 --- a/tests/data/src/simplewheel-2.0/setup.py +++ b/tests/data/src/simplewheel-2.0/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup(name='simplewheel', version='2.0', diff --git a/tests/data/src/singlemodule/setup.py b/tests/data/src/singlemodule/setup.py index 67ca9faef..622af1f8e 100644 --- a/tests/data/src/singlemodule/setup.py +++ b/tests/data/src/singlemodule/setup.py @@ -1,6 +1,5 @@ from setuptools import setup - setup( name="singlemodule", version='0.0.1', diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py index cb3de1e77..305ce8a73 100644 --- a/tests/functional/test_download.py +++ b/tests/functional/test_download.py @@ -1,7 +1,7 @@ import os import textwrap -import pytest +import pytest from pip.status_codes import ERROR from tests.lib.path import Path diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py index 1852fd98e..995ee3471 100644 --- a/tests/functional/test_freeze.py +++ b/tests/functional/test_freeze.py @@ -1,13 +1,12 @@ -import sys import os import re +import sys import textwrap +from doctest import ELLIPSIS, OutputChecker + import pytest -from doctest import OutputChecker, ELLIPSIS - from tests.lib import _create_test_package, _create_test_package_with_srcdir - distribute_re = re.compile('^distribute==[0-9.]+\n', re.MULTILINE) diff --git a/tests/functional/test_help.py b/tests/functional/test_help.py index 994cb66ab..862319c11 100644 --- a/tests/functional/test_help.py +++ b/tests/functional/test_help.py @@ -1,10 +1,9 @@ import pytest - -from pip.exceptions import CommandError -from pip.basecommand import ERROR, SUCCESS -from pip.commands.help import HelpCommand -from pip.commands import commands_dict as commands from mock import Mock +from pip.basecommand import ERROR, SUCCESS +from pip.commands import commands_dict as commands +from pip.commands.help import HelpCommand +from pip.exceptions import CommandError def test_run_method_should_return_success_when_finds_command_name(): diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index ab22617a4..88a5d1fba 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -1,19 +1,17 @@ +import glob import os import sys import textwrap -import glob - -from os.path import join, curdir, pardir +from os.path import curdir, join, pardir import pytest - from pip import pep425tags -from pip.utils import appdirs, rmtree from pip.status_codes import ERROR -from tests.lib import (pyversion, pyversion_tuple, - _create_test_package, _create_svn_repo, path_to_url, - create_test_package_with_setup, - requirements_file) +from pip.utils import appdirs, rmtree +from tests.lib import ( + _create_svn_repo, _create_test_package, create_test_package_with_setup, + path_to_url, pyversion, pyversion_tuple, requirements_file +) from tests.lib.local_repos import local_checkout from tests.lib.path import Path diff --git a/tests/functional/test_install_cleanup.py b/tests/functional/test_install_cleanup.py index 49fc5a0ab..36dfedf69 100644 --- a/tests/functional/test_install_cleanup.py +++ b/tests/functional/test_install_cleanup.py @@ -1,11 +1,10 @@ import os -import pytest - from os.path import exists -from tests.lib.local_repos import local_checkout +import pytest from pip.locations import write_delete_marker_file from pip.status_codes import PREVIOUS_BUILD_DIR_ERROR +from tests.lib.local_repos import local_checkout def test_cleanup_after_install(script, data): diff --git a/tests/functional/test_install_compat.py b/tests/functional/test_install_compat.py index d65600524..a16f2e4b9 100644 --- a/tests/functional/test_install_compat.py +++ b/tests/functional/test_install_compat.py @@ -3,8 +3,9 @@ Tests for compatibility workarounds. """ import os + import pytest -from tests.lib import pyversion, assert_all_changes +from tests.lib import assert_all_changes, pyversion @pytest.mark.network diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py index 27d65c4fe..72438162a 100644 --- a/tests/functional/test_install_config.py +++ b/tests/functional/test_install_config.py @@ -1,6 +1,7 @@ import os import tempfile import textwrap + import pytest diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index 2dcc4c131..d5b1ded74 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -1,7 +1,8 @@ import textwrap -import pytest from os.path import join +import pytest + @pytest.mark.network def test_simple_extras_install_from_pypi(script): diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index 9526a3ba4..797f1f30a 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -2,9 +2,9 @@ import os.path import textwrap import pytest - -from tests.lib import (pyversion, requirements_file, - _create_test_package_with_subdirectory) +from tests.lib import ( + _create_test_package_with_subdirectory, pyversion, requirements_file +) from tests.lib.local_repos import local_checkout diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py index c477771d8..ec4184eeb 100644 --- a/tests/functional/test_install_upgrade.py +++ b/tests/functional/test_install_upgrade.py @@ -3,7 +3,6 @@ import sys import textwrap import pytest - from tests.lib import assert_all_changes, pyversion from tests.lib.local_repos import local_checkout diff --git a/tests/functional/test_install_user.py b/tests/functional/test_install_user.py index e2cb27302..d3a90fcc6 100644 --- a/tests/functional/test_install_user.py +++ b/tests/functional/test_install_user.py @@ -3,14 +3,12 @@ tests specific to "pip install --user" """ import os import textwrap -import pytest - from os.path import curdir, isdir, isfile -from pip.compat import uses_pycache, cache_from_source - -from tests.lib.local_repos import local_checkout +import pytest +from pip.compat import cache_from_source, uses_pycache from tests.lib import pyversion +from tests.lib.local_repos import local_checkout def _patch_dist_in_site_packages(script): diff --git a/tests/functional/test_install_vcs.py b/tests/functional/test_install_vcs.py index f554ddbca..220790408 100644 --- a/tests/functional/test_install_vcs.py +++ b/tests/functional/test_install_vcs.py @@ -1,7 +1,7 @@ import pytest - -from tests.lib import (_create_test_package, _change_test_package_version, - pyversion) +from tests.lib import ( + _change_test_package_version, _create_test_package, pyversion +) from tests.lib.local_repos import local_checkout diff --git a/tests/functional/test_install_vcs_git.py b/tests/functional/test_install_vcs_git.py index d06a4d05a..be200762c 100644 --- a/tests/functional/test_install_vcs_git.py +++ b/tests/functional/test_install_vcs_git.py @@ -1,13 +1,10 @@ import pytest - from mock import patch - from pip.vcs.git import Git from tests.lib import _create_test_package from tests.lib.git_submodule_helpers import ( - _change_test_package_submodule, - _pull_in_submodule_changes_to_module, - _create_test_package_with_submodule, + _change_test_package_submodule, _create_test_package_with_submodule, + _pull_in_submodule_changes_to_module ) diff --git a/tests/functional/test_install_wheel.py b/tests/functional/test_install_wheel.py index 2eaee3605..346957433 100644 --- a/tests/functional/test_install_wheel.py +++ b/tests/functional/test_install_wheel.py @@ -1,8 +1,8 @@ +import glob import os import sys -import pytest -import glob +import pytest from tests.lib.path import Path diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py index e3ddc6993..041270263 100644 --- a/tests/functional/test_list.py +++ b/tests/functional/test_list.py @@ -1,5 +1,6 @@ import json import os + import pytest diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py index be99ffbe7..a00460f01 100644 --- a/tests/functional/test_search.py +++ b/tests/functional/test_search.py @@ -1,12 +1,10 @@ import pytest -from pip.commands.search import (highest_version, - print_results, - transform_hits, - SearchCommand) +from pip.commands.search import ( + SearchCommand, highest_version, print_results, transform_hits +) from pip.status_codes import NO_MATCHES_FOUND, SUCCESS from tests.lib import pyversion - if pyversion >= '3': VERBOSE_FALSE = False else: diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py index 12a36de63..cbcfac4aa 100644 --- a/tests/functional/test_uninstall.py +++ b/tests/functional/test_uninstall.py @@ -1,20 +1,18 @@ from __future__ import with_statement import json -import textwrap import os import sys -import pytest -import pretend - +import textwrap from os.path import join, normpath from tempfile import mkdtemp -from tests.lib import assert_all_changes -from tests.lib import create_test_package_with_setup -from tests.lib.local_repos import local_repo, local_checkout +import pretend +import pytest from pip.req import InstallRequirement from pip.utils import rmtree +from tests.lib import assert_all_changes, create_test_package_with_setup +from tests.lib.local_repos import local_checkout, local_repo @pytest.mark.network diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py index 53606a7b7..ddf21a35d 100644 --- a/tests/functional/test_uninstall_user.py +++ b/tests/functional/test_uninstall_user.py @@ -1,11 +1,11 @@ """ tests specific to uninstalling --user installs """ -import pytest from os.path import isdir, isfile -from tests.lib import pyversion, assert_all_changes +import pytest from tests.functional.test_install_user import _patch_dist_in_site_packages +from tests.lib import assert_all_changes, pyversion class Tests_UninstallUserSite: diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py index a52c1380a..b97f320e0 100644 --- a/tests/functional/test_wheel.py +++ b/tests/functional/test_wheel.py @@ -1,9 +1,8 @@ """'pip wheel' tests""" import os -import pytest - from os.path import exists +import pytest from pip.locations import write_delete_marker_file from pip.status_codes import ERROR, PREVIOUS_BUILD_DIR_ERROR from tests.lib import pyversion diff --git a/tests/lib/local_repos.py b/tests/lib/local_repos.py index 059a4c588..39aed6950 100644 --- a/tests/lib/local_repos.py +++ b/tests/lib/local_repos.py @@ -5,10 +5,9 @@ import subprocess from pip._vendor.six.moves.urllib import request as urllib_request -from pip.vcs import subversion, git, bazaar, mercurial +from pip.vcs import bazaar, git, mercurial, subversion from tests.lib import path_to_url - if hasattr(subprocess, "check_call"): subprocess_call = subprocess.check_call else: diff --git a/tests/lib/path.py b/tests/lib/path.py index 73577cdf9..d126eb86a 100644 --- a/tests/lib/path.py +++ b/tests/lib/path.py @@ -5,15 +5,16 @@ from __future__ import absolute_import import glob import os -import sys import shutil +import sys + +from pip._vendor import six try: from os import supports_fd except ImportError: supports_fd = set() -from pip._vendor import six _base = six.text_type if os.path.supports_unicode_filenames else str diff --git a/tests/lib/test_lib.py b/tests/lib/test_lib.py index 849ad3e63..a5021b1c6 100644 --- a/tests/lib/test_lib.py +++ b/tests/lib/test_lib.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import filecmp import re -from os.path import join, isdir +from os.path import isdir, join from tests.lib import SRC_DIR diff --git a/tests/lib/venv.py b/tests/lib/venv.py index 73a9f7f5d..47e79d7a6 100644 --- a/tests/lib/venv.py +++ b/tests/lib/venv.py @@ -1,14 +1,13 @@ from __future__ import absolute_import import os -import sys import subprocess +import sys import virtualenv as _virtualenv from .path import Path - # On Python < 3.3 we don't have subprocess.DEVNULL try: DEVNULL = subprocess.DEVNULL diff --git a/tests/scripts/test_all_pip.py b/tests/scripts/test_all_pip.py index c0e91ff41..66a8e405e 100644 --- a/tests/scripts/test_all_pip.py +++ b/tests/scripts/test_all_pip.py @@ -1,14 +1,13 @@ import os import re -import sys import subprocess -from os.path import dirname, abspath +import sys +from os.path import abspath, dirname from pip._vendor.six.moves.urllib import request as urllib_request from pip.utils import rmtree - src_folder = dirname(dirname(abspath(__file__))) if sys.platform == 'win32': diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py index 570e3b228..a408fb49d 100644 --- a/tests/unit/test_appdirs.py +++ b/tests/unit/test_appdirs.py @@ -4,7 +4,6 @@ import posixpath import sys import pretend - from pip.utils import appdirs diff --git a/tests/unit/test_cmdoptions.py b/tests/unit/test_cmdoptions.py index 30fb15505..60d5c9629 100644 --- a/tests/unit/test_cmdoptions.py +++ b/tests/unit/test_cmdoptions.py @@ -1,6 +1,6 @@ import pip -from pip.basecommand import Command from pip import cmdoptions +from pip.basecommand import Command class SimpleCommand(Command): diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py index 92be06146..1d092c331 100644 --- a/tests/unit/test_compat.py +++ b/tests/unit/test_compat.py @@ -1,6 +1,7 @@ import os -from pip.compat import expanduser, get_path_uid, native_str + import pytest +from pip.compat import expanduser, get_path_uid, native_str def test_get_path_uid(): diff --git a/tests/unit/test_download.py b/tests/unit/test_download.py index 1630393f0..a1fc77627 100644 --- a/tests/unit/test_download.py +++ b/tests/unit/test_download.py @@ -1,20 +1,19 @@ import hashlib import os from io import BytesIO -from shutil import rmtree, copy +from shutil import copy, rmtree from tempfile import mkdtemp from pip._vendor.six.moves.urllib import request as urllib_request -from mock import Mock, patch -import pytest - import pip -from pip.exceptions import HashMismatch +import pytest +from mock import Mock, patch from pip.download import ( - PipSession, SafeFileCache, path_to_url, unpack_http_url, url_to_path, - unpack_file_url, MultiDomainBasicAuth + MultiDomainBasicAuth, PipSession, SafeFileCache, path_to_url, + unpack_file_url, unpack_http_url, url_to_path ) +from pip.exceptions import HashMismatch from pip.index import Link from pip.utils.hashes import Hashes diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py index 24896ed92..732748f9c 100644 --- a/tests/unit/test_finder.py +++ b/tests/unit/test_finder.py @@ -1,18 +1,17 @@ -import pytest import sys -import pip.wheel +from pkg_resources import Distribution, parse_version + import pip.pep425tags - -from pkg_resources import parse_version, Distribution -from pip.req import InstallRequirement -from pip.index import ( - InstallationCandidate, PackageFinder, Link, FormatControl, - fmt_ctl_formats) -from pip.exceptions import BestVersionAlreadyInstalled, DistributionNotFound -from pip.download import PipSession - +import pip.wheel +import pytest from mock import Mock, patch +from pip.download import PipSession +from pip.exceptions import BestVersionAlreadyInstalled, DistributionNotFound +from pip.index import ( + FormatControl, InstallationCandidate, Link, PackageFinder, fmt_ctl_formats +) +from pip.req import InstallRequirement def test_no_mpkg(data): diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py index f25a0c4f8..2125c622e 100644 --- a/tests/unit/test_index.py +++ b/tests/unit/test_index.py @@ -1,9 +1,8 @@ import os.path -import pytest +import pytest from pip.download import PipSession -from pip.index import HTMLPage -from pip.index import PackageFinder, Link +from pip.index import HTMLPage, Link, PackageFinder def test_sort_locations_file_expand_dir(data): diff --git a/tests/unit/test_locations.py b/tests/unit/test_locations.py index 0489e55fb..8dce0f60b 100644 --- a/tests/unit/test_locations.py +++ b/tests/unit/test_locations.py @@ -2,14 +2,13 @@ locations.py tests """ -import os -import sys -import shutil -import tempfile import getpass +import os +import shutil +import sys +import tempfile from mock import Mock - from pip.locations import distutils_scheme if sys.platform == 'win32': diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py index dfae54023..c976b830b 100644 --- a/tests/unit/test_options.py +++ b/tests/unit/test_options.py @@ -1,8 +1,8 @@ import os -import pytest + import pip.configuration -from pip import main -from pip import cmdoptions +import pytest +from pip import cmdoptions, main from pip.basecommand import Command from pip.commands import commands_dict as commands diff --git a/tests/unit/test_pep425tags.py b/tests/unit/test_pep425tags.py index 6d12e47fc..3fef08087 100644 --- a/tests/unit/test_pep425tags.py +++ b/tests/unit/test_pep425tags.py @@ -1,4 +1,5 @@ import sys + from mock import patch from pip import pep425tags diff --git a/tests/unit/test_proxy.py b/tests/unit/test_proxy.py index 761712353..c33c8f56e 100644 --- a/tests/unit/test_proxy.py +++ b/tests/unit/test_proxy.py @@ -3,7 +3,6 @@ Tests for the proxy support in pip. """ import pip - from tests.lib import SRC_DIR from tests.lib.path import Path diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index 623cabed6..d7bb85429 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -3,21 +3,22 @@ import shutil import sys import tempfile -import pytest - -from mock import Mock, patch, mock_open -from pip.commands.install import InstallCommand -from pip.exceptions import (PreviousBuildDirError, InvalidWheelFilename, - InstallationError, HashErrors) -from pip.download import path_to_url, PipSession -from pip.index import PackageFinder -from pip.req import (InstallRequirement, RequirementSet, Requirements) -from pip.req.req_file import process_line -from pip.req.req_install import parse_editable -from pip.utils import read_text_file from pip._vendor import pkg_resources from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import Requirement + +import pytest +from mock import Mock, mock_open, patch +from pip.commands.install import InstallCommand +from pip.download import PipSession, path_to_url +from pip.exceptions import ( + HashErrors, InstallationError, InvalidWheelFilename, PreviousBuildDirError +) +from pip.index import PackageFinder +from pip.req import InstallRequirement, Requirements, RequirementSet +from pip.req.req_file import process_line +from pip.req.req_install import parse_editable +from pip.utils import read_text_file from tests.lib import assert_raises_regexp, requirements_file diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index a3fcf7a79..d1e00eea4 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -2,18 +2,18 @@ import os import subprocess import textwrap -from mock import patch, Mock -import pytest -from pretend import stub - import pip -from pip.exceptions import (InstallationError, RequirementsFileParseError) +import pytest +from mock import Mock, patch from pip.download import PipSession +from pip.exceptions import InstallationError, RequirementsFileParseError from pip.index import PackageFinder +from pip.req.req_file import ( + break_args_options, ignore_comments, join_lines, parse_requirements, + preprocess, process_line, skip_regex +) from pip.req.req_install import InstallRequirement -from pip.req.req_file import (parse_requirements, process_line, join_lines, - ignore_comments, break_args_options, skip_regex, - preprocess) +from pretend import stub from tests.lib import requirements_file diff --git a/tests/unit/test_req_install.py b/tests/unit/test_req_install.py index b956608cf..a24fbf201 100644 --- a/tests/unit/test_req_install.py +++ b/tests/unit/test_req_install.py @@ -2,7 +2,6 @@ import os import tempfile import pytest - from pip.req.req_install import InstallRequirement diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py index 7097ded9d..67ce6634d 100644 --- a/tests/unit/test_req_uninstall.py +++ b/tests/unit/test_req_uninstall.py @@ -1,9 +1,8 @@ import os +import pip.req.req_uninstall import pytest from mock import Mock - -import pip.req.req_uninstall from pip.req.req_uninstall import UninstallPathSet, uninstallation_paths diff --git a/tests/unit/test_unit_outdated.py b/tests/unit/test_unit_outdated.py index 24313c8f3..3108cf6b2 100644 --- a/tests/unit/test_unit_outdated.py +++ b/tests/unit/test_unit_outdated.py @@ -1,13 +1,13 @@ -import sys import datetime import os +import sys from contextlib import contextmanager -import freezegun -import pytest -import pretend - from pip._vendor import lockfile + +import freezegun +import pretend +import pytest from pip.index import InstallationCandidate from pip.utils import outdated diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index e29d00020..fbb6d89e7 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -5,26 +5,29 @@ util tests """ import os +import shutil import stat import sys -import time -import shutil import tempfile +import time import warnings -import pytest +from pip._vendor.six import BytesIO +import pytest from mock import Mock, patch -from pip.exceptions import (HashMismatch, HashMissing, InstallationError, - UnsupportedPythonVersion) -from pip.utils import (egg_link_path, get_installed_distributions, - untar_file, unzip_file, rmtree, normalize_path) +from pip.exceptions import ( + HashMismatch, HashMissing, InstallationError, UnsupportedPythonVersion +) +from pip.utils import ( + egg_link_path, get_installed_distributions, normalize_path, rmtree, + untar_file, unzip_file +) from pip.utils.build import BuildDirectory from pip.utils.encoding import auto_decode -from pip.utils.hashes import Hashes, MissingHashes from pip.utils.glibc import check_glibc_version +from pip.utils.hashes import Hashes, MissingHashes from pip.utils.packaging import check_dist_requires_python -from pip._vendor.six import BytesIO class Tests_EgglinkPath: diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index cfcad6410..13e5e876c 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -1,11 +1,12 @@ +from pip._vendor.packaging.version import parse as parse_version + import pytest -from tests.lib import pyversion +from mock import Mock from pip.vcs import VersionControl from pip.vcs.bazaar import Bazaar from pip.vcs.git import Git from pip.vcs.subversion import Subversion -from mock import Mock -from pip._vendor.packaging.version import parse as parse_version +from tests.lib import pyversion if pyversion >= '3': VERBOSE_FALSE = False diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py index 40e17998f..46182f1ef 100644 --- a/tests/unit/test_wheel.py +++ b/tests/unit/test_wheel.py @@ -1,12 +1,12 @@ """Tests for wheel binary packages and .dist-info.""" import os -import pytest -from mock import patch, Mock - from pip._vendor.packaging.requirements import Requirement + +import pytest +from mock import Mock, patch from pip import pep425tags, wheel -from pip.compat import expanduser, WINDOWS +from pip.compat import WINDOWS, expanduser from pip.exceptions import InvalidWheelFilename, UnsupportedWheel from pip.utils import unpack_file