mirror of https://github.com/pypa/pip
Merge pull request #7969 from deveshks/fix-svn-version-check
This commit is contained in:
commit
f84f91af27
|
@ -0,0 +1 @@
|
|||
The VCS commands run by pip as subprocesses don't merge stdout and stderr anymore, improving the output parsing by subsequent commands.
|
|
@ -28,6 +28,7 @@ from pip._internal.exceptions import (
|
|||
CommandError,
|
||||
InstallationError,
|
||||
PreviousBuildDirError,
|
||||
SubProcessError,
|
||||
UninstallationError,
|
||||
)
|
||||
from pip._internal.utils.deprecation import deprecated
|
||||
|
@ -201,7 +202,8 @@ class Command(CommandContextMixIn):
|
|||
logger.debug('Exception information:', exc_info=True)
|
||||
|
||||
return PREVIOUS_BUILD_DIR_ERROR
|
||||
except (InstallationError, UninstallationError, BadCommand) as exc:
|
||||
except (InstallationError, UninstallationError, BadCommand,
|
||||
SubProcessError) as exc:
|
||||
logger.critical(str(exc))
|
||||
logger.debug('Exception information:', exc_info=True)
|
||||
|
||||
|
|
|
@ -84,6 +84,11 @@ class CommandError(PipError):
|
|||
"""Raised when there is an error in command-line arguments"""
|
||||
|
||||
|
||||
class SubProcessError(PipError):
|
||||
"""Raised when there is an error raised while executing a
|
||||
command in subprocess"""
|
||||
|
||||
|
||||
class PreviousBuildDirError(PipError):
|
||||
"""Raised when there's a previous conflicting build directory"""
|
||||
|
||||
|
|
|
@ -54,8 +54,7 @@ class Bazaar(VersionControl):
|
|||
|
||||
url, rev_options = self.get_url_rev_options(url)
|
||||
self.run_command(
|
||||
make_command('export', location, url, rev_options.to_args()),
|
||||
show_stdout=False,
|
||||
make_command('export', location, url, rev_options.to_args())
|
||||
)
|
||||
|
||||
def fetch_new(self, dest, url, rev_options):
|
||||
|
@ -92,7 +91,7 @@ class Bazaar(VersionControl):
|
|||
|
||||
@classmethod
|
||||
def get_remote_url(cls, location):
|
||||
urls = cls.run_command(['info'], show_stdout=False, cwd=location)
|
||||
urls = cls.run_command(['info'], cwd=location)
|
||||
for line in urls.splitlines():
|
||||
line = line.strip()
|
||||
for x in ('checkout of branch: ',
|
||||
|
@ -107,7 +106,7 @@ class Bazaar(VersionControl):
|
|||
@classmethod
|
||||
def get_revision(cls, location):
|
||||
revision = cls.run_command(
|
||||
['revno'], show_stdout=False, cwd=location,
|
||||
['revno'], cwd=location,
|
||||
)
|
||||
return revision.splitlines()[-1]
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ 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._internal.exceptions import BadCommand, InstallationError
|
||||
from pip._internal.exceptions import BadCommand, SubProcessError
|
||||
from pip._internal.utils.misc import display_path, hide_url
|
||||
from pip._internal.utils.subprocess import make_command
|
||||
from pip._internal.utils.temp_dir import TempDirectory
|
||||
|
@ -78,7 +78,7 @@ class Git(VersionControl):
|
|||
|
||||
def get_git_version(self):
|
||||
VERSION_PFX = 'git version '
|
||||
version = self.run_command(['version'], show_stdout=False)
|
||||
version = self.run_command(['version'])
|
||||
if version.startswith(VERSION_PFX):
|
||||
version = version[len(VERSION_PFX):].split()[0]
|
||||
else:
|
||||
|
@ -101,7 +101,7 @@ class Git(VersionControl):
|
|||
# and to suppress the message to stderr.
|
||||
args = ['symbolic-ref', '-q', 'HEAD']
|
||||
output = cls.run_command(
|
||||
args, extra_ok_returncodes=(1, ), show_stdout=False, cwd=location,
|
||||
args, extra_ok_returncodes=(1, ), cwd=location,
|
||||
)
|
||||
ref = output.strip()
|
||||
|
||||
|
@ -120,7 +120,7 @@ class Git(VersionControl):
|
|||
self.unpack(temp_dir.path, url=url)
|
||||
self.run_command(
|
||||
['checkout-index', '-a', '-f', '--prefix', location],
|
||||
show_stdout=False, cwd=temp_dir.path
|
||||
cwd=temp_dir.path
|
||||
)
|
||||
|
||||
@classmethod
|
||||
|
@ -134,8 +134,13 @@ class Git(VersionControl):
|
|||
rev: the revision name.
|
||||
"""
|
||||
# Pass rev to pre-filter the list.
|
||||
output = cls.run_command(['show-ref', rev], cwd=dest,
|
||||
show_stdout=False, on_returncode='ignore')
|
||||
|
||||
output = ''
|
||||
try:
|
||||
output = cls.run_command(['show-ref', rev], cwd=dest)
|
||||
except SubProcessError:
|
||||
pass
|
||||
|
||||
refs = {}
|
||||
for line in output.strip().splitlines():
|
||||
try:
|
||||
|
@ -286,7 +291,7 @@ class Git(VersionControl):
|
|||
# exits with return code 1 if there are no matching lines.
|
||||
stdout = cls.run_command(
|
||||
['config', '--get-regexp', r'remote\..*\.url'],
|
||||
extra_ok_returncodes=(1, ), show_stdout=False, cwd=location,
|
||||
extra_ok_returncodes=(1, ), cwd=location,
|
||||
)
|
||||
remotes = stdout.splitlines()
|
||||
try:
|
||||
|
@ -306,7 +311,7 @@ class Git(VersionControl):
|
|||
if rev is None:
|
||||
rev = 'HEAD'
|
||||
current_rev = cls.run_command(
|
||||
['rev-parse', rev], show_stdout=False, cwd=location,
|
||||
['rev-parse', rev], cwd=location,
|
||||
)
|
||||
return current_rev.strip()
|
||||
|
||||
|
@ -319,7 +324,7 @@ class Git(VersionControl):
|
|||
# find the repo root
|
||||
git_dir = cls.run_command(
|
||||
['rev-parse', '--git-dir'],
|
||||
show_stdout=False, cwd=location).strip()
|
||||
cwd=location).strip()
|
||||
if not os.path.isabs(git_dir):
|
||||
git_dir = os.path.join(location, git_dir)
|
||||
repo_root = os.path.abspath(os.path.join(git_dir, '..'))
|
||||
|
@ -378,15 +383,13 @@ class Git(VersionControl):
|
|||
r = cls.run_command(
|
||||
['rev-parse', '--show-toplevel'],
|
||||
cwd=location,
|
||||
show_stdout=False,
|
||||
on_returncode='raise',
|
||||
log_failed_cmd=False,
|
||||
)
|
||||
except BadCommand:
|
||||
logger.debug("could not determine if %s is under git control "
|
||||
"because git is not available", location)
|
||||
return None
|
||||
except InstallationError:
|
||||
except SubProcessError:
|
||||
return None
|
||||
return os.path.normpath(r.rstrip('\r\n'))
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import os
|
|||
|
||||
from pip._vendor.six.moves import configparser
|
||||
|
||||
from pip._internal.exceptions import BadCommand, InstallationError
|
||||
from pip._internal.exceptions import BadCommand, SubProcessError
|
||||
from pip._internal.utils.misc import display_path
|
||||
from pip._internal.utils.subprocess import make_command
|
||||
from pip._internal.utils.temp_dir import TempDirectory
|
||||
|
@ -47,7 +47,7 @@ class Mercurial(VersionControl):
|
|||
self.unpack(temp_dir.path, url=url)
|
||||
|
||||
self.run_command(
|
||||
['archive', location], show_stdout=False, cwd=temp_dir.path
|
||||
['archive', location], cwd=temp_dir.path
|
||||
)
|
||||
|
||||
def fetch_new(self, dest, url, rev_options):
|
||||
|
@ -92,7 +92,7 @@ class Mercurial(VersionControl):
|
|||
def get_remote_url(cls, location):
|
||||
url = cls.run_command(
|
||||
['showconfig', 'paths.default'],
|
||||
show_stdout=False, cwd=location).strip()
|
||||
cwd=location).strip()
|
||||
if cls._is_local_repository(url):
|
||||
url = path_to_url(url)
|
||||
return url.strip()
|
||||
|
@ -103,8 +103,7 @@ class Mercurial(VersionControl):
|
|||
Return the repository-local changeset revision number, as an integer.
|
||||
"""
|
||||
current_revision = cls.run_command(
|
||||
['parents', '--template={rev}'],
|
||||
show_stdout=False, cwd=location).strip()
|
||||
['parents', '--template={rev}'], cwd=location).strip()
|
||||
return current_revision
|
||||
|
||||
@classmethod
|
||||
|
@ -115,7 +114,7 @@ class Mercurial(VersionControl):
|
|||
"""
|
||||
current_rev_hash = cls.run_command(
|
||||
['parents', '--template={node}'],
|
||||
show_stdout=False, cwd=location).strip()
|
||||
cwd=location).strip()
|
||||
return current_rev_hash
|
||||
|
||||
@classmethod
|
||||
|
@ -131,7 +130,7 @@ class Mercurial(VersionControl):
|
|||
"""
|
||||
# find the repo root
|
||||
repo_root = cls.run_command(
|
||||
['root'], show_stdout=False, cwd=location).strip()
|
||||
['root'], cwd=location).strip()
|
||||
if not os.path.isabs(repo_root):
|
||||
repo_root = os.path.abspath(os.path.join(location, repo_root))
|
||||
return find_path_to_setup_from_repo_root(location, repo_root)
|
||||
|
@ -145,15 +144,13 @@ class Mercurial(VersionControl):
|
|||
r = cls.run_command(
|
||||
['root'],
|
||||
cwd=location,
|
||||
show_stdout=False,
|
||||
on_returncode='raise',
|
||||
log_failed_cmd=False,
|
||||
)
|
||||
except BadCommand:
|
||||
logger.debug("could not determine if %s is under hg control "
|
||||
"because hg is not available", location)
|
||||
return None
|
||||
except InstallationError:
|
||||
except SubProcessError:
|
||||
return None
|
||||
return os.path.normpath(r.rstrip('\r\n'))
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ class Subversion(VersionControl):
|
|||
|
||||
@classmethod
|
||||
def _get_svn_url_rev(cls, location):
|
||||
from pip._internal.exceptions import InstallationError
|
||||
from pip._internal.exceptions import SubProcessError
|
||||
|
||||
entries_path = os.path.join(location, cls.dirname, 'entries')
|
||||
if os.path.exists(entries_path):
|
||||
|
@ -165,13 +165,12 @@ class Subversion(VersionControl):
|
|||
# are only potentially needed for remote server requests.
|
||||
xml = cls.run_command(
|
||||
['info', '--xml', location],
|
||||
show_stdout=False,
|
||||
)
|
||||
url = _svn_info_xml_url_re.search(xml).group(1)
|
||||
revs = [
|
||||
int(m.group(1)) for m in _svn_info_xml_rev_re.finditer(xml)
|
||||
]
|
||||
except InstallationError:
|
||||
except SubProcessError:
|
||||
url, revs = None, []
|
||||
|
||||
if revs:
|
||||
|
@ -215,7 +214,8 @@ class Subversion(VersionControl):
|
|||
# svn, version 1.7.14 (r1542130)
|
||||
# compiled Mar 28 2018, 08:49:13 on x86_64-pc-linux-gnu
|
||||
version_prefix = 'svn, version '
|
||||
version = self.run_command(['--version'], show_stdout=False)
|
||||
version = self.run_command(['--version'])
|
||||
|
||||
if not version.startswith(version_prefix):
|
||||
return ()
|
||||
|
||||
|
@ -297,7 +297,7 @@ class Subversion(VersionControl):
|
|||
'export', self.get_remote_call_options(),
|
||||
rev_options.to_args(), url, location,
|
||||
)
|
||||
self.run_command(cmd_args, show_stdout=False)
|
||||
self.run_command(cmd_args)
|
||||
|
||||
def fetch_new(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
|
|
|
@ -6,13 +6,19 @@ import errno
|
|||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from pip._vendor import pkg_resources
|
||||
from pip._vendor.six.moves.urllib import parse as urllib_parse
|
||||
|
||||
from pip._internal.exceptions import BadCommand, InstallationError
|
||||
from pip._internal.utils.compat import samefile
|
||||
from pip._internal.exceptions import (
|
||||
BadCommand,
|
||||
InstallationError,
|
||||
SubProcessError,
|
||||
)
|
||||
from pip._internal.utils.compat import console_to_str, samefile
|
||||
from pip._internal.utils.logging import subprocess_logger
|
||||
from pip._internal.utils.misc import (
|
||||
ask_path_exists,
|
||||
backup_dir,
|
||||
|
@ -21,16 +27,20 @@ from pip._internal.utils.misc import (
|
|||
hide_value,
|
||||
rmtree,
|
||||
)
|
||||
from pip._internal.utils.subprocess import call_subprocess, make_command
|
||||
from pip._internal.utils.subprocess import (
|
||||
format_command_args,
|
||||
make_command,
|
||||
make_subprocess_output_error,
|
||||
reveal_command_args,
|
||||
)
|
||||
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
|
||||
from pip._internal.utils.urls import get_url_scheme
|
||||
|
||||
if MYPY_CHECK_RUNNING:
|
||||
from typing import (
|
||||
Any, Dict, Iterable, Iterator, List, Mapping, Optional, Text, Tuple,
|
||||
Type, Union
|
||||
Dict, Iterable, Iterator, List, Optional, Text, Tuple,
|
||||
Type, Union, Mapping, Any
|
||||
)
|
||||
from pip._internal.cli.spinners import SpinnerInterface
|
||||
from pip._internal.utils.misc import HiddenText
|
||||
from pip._internal.utils.subprocess import CommandArgs
|
||||
|
||||
|
@ -71,6 +81,92 @@ def make_vcs_requirement_url(repo_url, rev, project_name, subdir=None):
|
|||
return req
|
||||
|
||||
|
||||
def call_subprocess(
|
||||
cmd, # type: Union[List[str], CommandArgs]
|
||||
cwd=None, # type: Optional[str]
|
||||
extra_environ=None, # type: Optional[Mapping[str, Any]]
|
||||
extra_ok_returncodes=None, # type: Optional[Iterable[int]]
|
||||
log_failed_cmd=True # type: Optional[bool]
|
||||
):
|
||||
# type: (...) -> Text
|
||||
"""
|
||||
Args:
|
||||
extra_ok_returncodes: an iterable of integer return codes that are
|
||||
acceptable, in addition to 0. Defaults to None, which means [].
|
||||
log_failed_cmd: if false, failed commands are not logged,
|
||||
only raised.
|
||||
"""
|
||||
if extra_ok_returncodes is None:
|
||||
extra_ok_returncodes = []
|
||||
|
||||
# log the subprocess output at DEBUG level.
|
||||
log_subprocess = subprocess_logger.debug
|
||||
|
||||
env = os.environ.copy()
|
||||
if extra_environ:
|
||||
env.update(extra_environ)
|
||||
|
||||
# Whether the subprocess will be visible in the console.
|
||||
showing_subprocess = True
|
||||
|
||||
command_desc = format_command_args(cmd)
|
||||
try:
|
||||
proc = subprocess.Popen(
|
||||
# Convert HiddenText objects to the underlying str.
|
||||
reveal_command_args(cmd),
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
cwd=cwd
|
||||
)
|
||||
if proc.stdin:
|
||||
proc.stdin.close()
|
||||
except Exception as exc:
|
||||
if log_failed_cmd:
|
||||
subprocess_logger.critical(
|
||||
"Error %s while executing command %s", exc, command_desc,
|
||||
)
|
||||
raise
|
||||
all_output = []
|
||||
while True:
|
||||
# The "line" value is a unicode string in Python 2.
|
||||
line = None
|
||||
if proc.stdout:
|
||||
line = console_to_str(proc.stdout.readline())
|
||||
if not line:
|
||||
break
|
||||
line = line.rstrip()
|
||||
all_output.append(line + '\n')
|
||||
|
||||
# Show the line immediately.
|
||||
log_subprocess(line)
|
||||
try:
|
||||
proc.wait()
|
||||
finally:
|
||||
if proc.stdout:
|
||||
proc.stdout.close()
|
||||
|
||||
proc_had_error = (
|
||||
proc.returncode and proc.returncode not in extra_ok_returncodes
|
||||
)
|
||||
if proc_had_error:
|
||||
if not showing_subprocess and log_failed_cmd:
|
||||
# Then the subprocess streams haven't been logged to the
|
||||
# console yet.
|
||||
msg = make_subprocess_output_error(
|
||||
cmd_args=cmd,
|
||||
cwd=cwd,
|
||||
lines=all_output,
|
||||
exit_status=proc.returncode,
|
||||
)
|
||||
subprocess_logger.error(msg)
|
||||
exc_msg = (
|
||||
'Command errored out with exit status {}: {} '
|
||||
'Check the logs for full command output.'
|
||||
).format(proc.returncode, command_desc)
|
||||
raise SubProcessError(exc_msg)
|
||||
return ''.join(all_output)
|
||||
|
||||
|
||||
def find_path_to_setup_from_repo_root(location, repo_root):
|
||||
# type: (str, str) -> Optional[str]
|
||||
"""
|
||||
|
@ -659,13 +755,9 @@ class VersionControl(object):
|
|||
def run_command(
|
||||
cls,
|
||||
cmd, # type: Union[List[str], CommandArgs]
|
||||
show_stdout=True, # type: bool
|
||||
cwd=None, # type: Optional[str]
|
||||
on_returncode='raise', # type: str
|
||||
extra_ok_returncodes=None, # type: Optional[Iterable[int]]
|
||||
command_desc=None, # type: Optional[str]
|
||||
extra_environ=None, # type: Optional[Mapping[str, Any]]
|
||||
spinner=None, # type: Optional[SpinnerInterface]
|
||||
extra_ok_returncodes=None, # type: Optional[Iterable[int]]
|
||||
log_failed_cmd=True # type: bool
|
||||
):
|
||||
# type: (...) -> Text
|
||||
|
@ -676,13 +768,9 @@ class VersionControl(object):
|
|||
"""
|
||||
cmd = make_command(cls.name, *cmd)
|
||||
try:
|
||||
return call_subprocess(cmd, show_stdout, cwd,
|
||||
on_returncode=on_returncode,
|
||||
extra_ok_returncodes=extra_ok_returncodes,
|
||||
command_desc=command_desc,
|
||||
return call_subprocess(cmd, cwd,
|
||||
extra_environ=extra_environ,
|
||||
unset_environ=cls.unset_environ,
|
||||
spinner=spinner,
|
||||
extra_ok_returncodes=extra_ok_returncodes,
|
||||
log_failed_cmd=log_failed_cmd)
|
||||
except OSError as e:
|
||||
# errno.ENOENT = no such file or directory
|
||||
|
|
Loading…
Reference in New Issue