Eliminado venv y www del repositorio, agrege un requirements igual
This commit is contained in:
@@ -1,36 +1,71 @@
|
||||
"""Handles all VCS (version control) support"""
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
||||
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
|
||||
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, call_subprocess, display_path, rmtree,
|
||||
ask_path_exists,
|
||||
backup_dir,
|
||||
display_path,
|
||||
hide_url,
|
||||
hide_value,
|
||||
rmtree,
|
||||
)
|
||||
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, List, Mapping, Optional, Text, Tuple, Type
|
||||
Dict, Iterable, Iterator, List, Optional, Text, Tuple,
|
||||
Type, Union, Mapping, Any
|
||||
)
|
||||
from pip._internal.utils.ui import SpinnerInterface
|
||||
from pip._internal.utils.misc import HiddenText
|
||||
from pip._internal.utils.subprocess import CommandArgs
|
||||
|
||||
AuthInfo = Tuple[Optional[str], Optional[str]]
|
||||
|
||||
|
||||
__all__ = ['vcs']
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def is_url(name):
|
||||
# type: (Union[str, Text]) -> bool
|
||||
"""
|
||||
Return true if the name looks like a URL.
|
||||
"""
|
||||
scheme = get_url_scheme(name)
|
||||
if scheme is None:
|
||||
return False
|
||||
return scheme in ['http', 'https', 'file', 'ftp'] + vcs.all_schemes
|
||||
|
||||
|
||||
def make_vcs_requirement_url(repo_url, rev, project_name, subdir=None):
|
||||
# type: (str, str, str, Optional[str]) -> str
|
||||
"""
|
||||
Return the URL for a VCS requirement.
|
||||
|
||||
@@ -46,6 +81,120 @@ 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]
|
||||
"""
|
||||
Find the path to `setup.py` by searching up the filesystem from `location`.
|
||||
Return the path to `setup.py` relative to `repo_root`.
|
||||
Return None if `setup.py` is in `repo_root` or cannot be found.
|
||||
"""
|
||||
# find setup.py
|
||||
orig_location = location
|
||||
while not os.path.exists(os.path.join(location, 'setup.py')):
|
||||
last_location = location
|
||||
location = os.path.dirname(location)
|
||||
if location == last_location:
|
||||
# We've traversed up to the root of the filesystem without
|
||||
# finding setup.py
|
||||
logger.warning(
|
||||
"Could not find setup.py for directory %s (tried all "
|
||||
"parent directories)",
|
||||
orig_location,
|
||||
)
|
||||
return None
|
||||
|
||||
if samefile(repo_root, location):
|
||||
return None
|
||||
|
||||
return os.path.relpath(location, repo_root)
|
||||
|
||||
|
||||
class RemoteNotFoundError(Exception):
|
||||
pass
|
||||
|
||||
@@ -63,7 +212,7 @@ class RevOptions(object):
|
||||
self,
|
||||
vc_class, # type: Type[VersionControl]
|
||||
rev=None, # type: Optional[str]
|
||||
extra_args=None, # type: Optional[List[str]]
|
||||
extra_args=None, # type: Optional[CommandArgs]
|
||||
):
|
||||
# type: (...) -> None
|
||||
"""
|
||||
@@ -78,8 +227,10 @@ class RevOptions(object):
|
||||
self.extra_args = extra_args
|
||||
self.rev = rev
|
||||
self.vc_class = vc_class
|
||||
self.branch_name = None # type: Optional[str]
|
||||
|
||||
def __repr__(self):
|
||||
# type: () -> str
|
||||
return '<RevOptions {}: rev={!r}>'.format(self.vc_class.name, self.rev)
|
||||
|
||||
@property
|
||||
@@ -91,11 +242,11 @@ class RevOptions(object):
|
||||
return self.rev
|
||||
|
||||
def to_args(self):
|
||||
# type: () -> List[str]
|
||||
# type: () -> CommandArgs
|
||||
"""
|
||||
Return the VCS-specific command arguments.
|
||||
"""
|
||||
args = [] # type: List[str]
|
||||
args = [] # type: CommandArgs
|
||||
rev = self.arg_rev
|
||||
if rev is not None:
|
||||
args += self.vc_class.get_base_rev_args(rev)
|
||||
@@ -136,6 +287,7 @@ class VcsSupport(object):
|
||||
super(VcsSupport, self).__init__()
|
||||
|
||||
def __iter__(self):
|
||||
# type: () -> Iterator[str]
|
||||
return self._registry.__iter__()
|
||||
|
||||
@property
|
||||
@@ -176,10 +328,32 @@ class VcsSupport(object):
|
||||
Return a VersionControl object if a repository of that type is found
|
||||
at the given directory.
|
||||
"""
|
||||
vcs_backends = {}
|
||||
for vcs_backend in self._registry.values():
|
||||
if vcs_backend.controls_location(location):
|
||||
logger.debug('Determine that %s uses VCS: %s',
|
||||
location, vcs_backend.name)
|
||||
repo_path = vcs_backend.get_repository_root(location)
|
||||
if not repo_path:
|
||||
continue
|
||||
logger.debug('Determine that %s uses VCS: %s',
|
||||
location, vcs_backend.name)
|
||||
vcs_backends[repo_path] = vcs_backend
|
||||
|
||||
if not vcs_backends:
|
||||
return None
|
||||
|
||||
# Choose the VCS in the inner-most directory. Since all repository
|
||||
# roots found here would be either `location` or one of its
|
||||
# parents, the longest path should have the most path components,
|
||||
# i.e. the backend representing the inner-most repository.
|
||||
inner_most_repo_path = max(vcs_backends, key=len)
|
||||
return vcs_backends[inner_most_repo_path]
|
||||
|
||||
def get_backend_for_scheme(self, scheme):
|
||||
# type: (str) -> Optional[VersionControl]
|
||||
"""
|
||||
Return a VersionControl object or None.
|
||||
"""
|
||||
for vcs_backend in self._registry.values():
|
||||
if scheme in vcs_backend.schemes:
|
||||
return vcs_backend
|
||||
return None
|
||||
|
||||
@@ -207,6 +381,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def should_add_vcs_url_prefix(cls, remote_url):
|
||||
# type: (str) -> bool
|
||||
"""
|
||||
Return whether the vcs prefix (e.g. "git+") should be added to a
|
||||
repository's remote url when used in a requirement.
|
||||
@@ -214,14 +389,17 @@ class VersionControl(object):
|
||||
return not remote_url.lower().startswith('{}:'.format(cls.name))
|
||||
|
||||
@classmethod
|
||||
def get_subdirectory(cls, repo_dir):
|
||||
def get_subdirectory(cls, location):
|
||||
# type: (str) -> Optional[str]
|
||||
"""
|
||||
Return the path to setup.py, relative to the repo root.
|
||||
Return None if setup.py is in the repo root.
|
||||
"""
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def get_requirement_revision(cls, repo_dir):
|
||||
# type: (str) -> str
|
||||
"""
|
||||
Return the revision string that should be used in a requirement.
|
||||
"""
|
||||
@@ -229,6 +407,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def get_src_requirement(cls, repo_dir, project_name):
|
||||
# type: (str, str) -> Optional[str]
|
||||
"""
|
||||
Return the requirement string to use to redownload the files
|
||||
currently at the given repository directory.
|
||||
@@ -256,6 +435,7 @@ class VersionControl(object):
|
||||
|
||||
@staticmethod
|
||||
def get_base_rev_args(rev):
|
||||
# type: (str) -> List[str]
|
||||
"""
|
||||
Return the base revision arguments for a vcs command.
|
||||
|
||||
@@ -264,9 +444,23 @@ class VersionControl(object):
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def is_immutable_rev_checkout(self, url, dest):
|
||||
# type: (str, str) -> bool
|
||||
"""
|
||||
Return true if the commit hash checked out at dest matches
|
||||
the revision in url.
|
||||
|
||||
Always return False, if the VCS does not support immutable commit
|
||||
hashes.
|
||||
|
||||
This method does not check if there are local uncommitted changes
|
||||
in dest after checkout, as pip currently has no use case for that.
|
||||
"""
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
def make_rev_options(cls, rev=None, extra_args=None):
|
||||
# type: (Optional[str], Optional[List[str]]) -> RevOptions
|
||||
# type: (Optional[str], Optional[CommandArgs]) -> RevOptions
|
||||
"""
|
||||
Return a RevOptions object.
|
||||
|
||||
@@ -287,6 +481,7 @@ class VersionControl(object):
|
||||
return repo.startswith(os.path.sep) or bool(drive)
|
||||
|
||||
def export(self, location, url):
|
||||
# type: (str, HiddenText) -> None
|
||||
"""
|
||||
Export the repository at the url to the destination location
|
||||
i.e. only download the files, without vcs informations
|
||||
@@ -297,6 +492,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def get_netloc_and_auth(cls, netloc, scheme):
|
||||
# type: (str, str) -> Tuple[str, Tuple[Optional[str], Optional[str]]]
|
||||
"""
|
||||
Parse the repository URL's netloc, and return the new netloc to use
|
||||
along with auth information.
|
||||
@@ -336,28 +532,38 @@ class VersionControl(object):
|
||||
rev = None
|
||||
if '@' in path:
|
||||
path, rev = path.rsplit('@', 1)
|
||||
if not rev:
|
||||
raise InstallationError(
|
||||
"The URL {!r} has an empty revision (after @) "
|
||||
"which is not supported. Include a revision after @ "
|
||||
"or remove @ from the URL.".format(url)
|
||||
)
|
||||
url = urllib_parse.urlunsplit((scheme, netloc, path, query, ''))
|
||||
return url, rev, user_pass
|
||||
|
||||
@staticmethod
|
||||
def make_rev_args(username, password):
|
||||
# type: (Optional[str], Optional[HiddenText]) -> CommandArgs
|
||||
"""
|
||||
Return the RevOptions "extra arguments" to use in obtain().
|
||||
"""
|
||||
return []
|
||||
|
||||
def get_url_rev_options(self, url):
|
||||
# type: (str) -> Tuple[str, RevOptions]
|
||||
# type: (HiddenText) -> Tuple[HiddenText, RevOptions]
|
||||
"""
|
||||
Return the URL and RevOptions object to use in obtain() and in
|
||||
some cases export(), as a tuple (url, rev_options).
|
||||
"""
|
||||
url, rev, user_pass = self.get_url_rev_and_auth(url)
|
||||
username, password = user_pass
|
||||
secret_url, rev, user_pass = self.get_url_rev_and_auth(url.secret)
|
||||
username, secret_password = user_pass
|
||||
password = None # type: Optional[HiddenText]
|
||||
if secret_password is not None:
|
||||
password = hide_value(secret_password)
|
||||
extra_args = self.make_rev_args(username, password)
|
||||
rev_options = self.make_rev_options(rev, extra_args=extra_args)
|
||||
|
||||
return url, rev_options
|
||||
return hide_url(secret_url), rev_options
|
||||
|
||||
@staticmethod
|
||||
def normalize_url(url):
|
||||
@@ -377,6 +583,7 @@ class VersionControl(object):
|
||||
return (cls.normalize_url(url1) == cls.normalize_url(url2))
|
||||
|
||||
def fetch_new(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
"""
|
||||
Fetch a revision from a repository, in the case that this is the
|
||||
first fetch from the repository.
|
||||
@@ -388,6 +595,7 @@ class VersionControl(object):
|
||||
raise NotImplementedError
|
||||
|
||||
def switch(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
"""
|
||||
Switch the repo at ``dest`` to point to ``URL``.
|
||||
|
||||
@@ -397,6 +605,7 @@ class VersionControl(object):
|
||||
raise NotImplementedError
|
||||
|
||||
def update(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
"""
|
||||
Update an already-existing repo to the given ``rev_options``.
|
||||
|
||||
@@ -407,6 +616,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def is_commit_id_equal(cls, dest, name):
|
||||
# type: (str, Optional[str]) -> bool
|
||||
"""
|
||||
Return whether the id of the current commit equals the given name.
|
||||
|
||||
@@ -417,7 +627,7 @@ class VersionControl(object):
|
||||
raise NotImplementedError
|
||||
|
||||
def obtain(self, dest, url):
|
||||
# type: (str, str) -> None
|
||||
# type: (str, HiddenText) -> None
|
||||
"""
|
||||
Install or update in editable mode the package represented by this
|
||||
VersionControl object.
|
||||
@@ -434,7 +644,7 @@ class VersionControl(object):
|
||||
rev_display = rev_options.to_display()
|
||||
if self.is_repository_directory(dest):
|
||||
existing_url = self.get_remote_url(dest)
|
||||
if self.compare_urls(existing_url, url):
|
||||
if self.compare_urls(existing_url, url.secret):
|
||||
logger.debug(
|
||||
'%s in %s exists, and has correct URL (%s)',
|
||||
self.repo_name.title(),
|
||||
@@ -478,7 +688,8 @@ class VersionControl(object):
|
||||
self.name,
|
||||
url,
|
||||
)
|
||||
response = ask_path_exists('What to do? %s' % prompt[0], prompt[1])
|
||||
response = ask_path_exists('What to do? {}'.format(
|
||||
prompt[0]), prompt[1])
|
||||
|
||||
if response == 'a':
|
||||
sys.exit(-1)
|
||||
@@ -510,7 +721,7 @@ class VersionControl(object):
|
||||
self.switch(dest, url, rev_options)
|
||||
|
||||
def unpack(self, location, url):
|
||||
# type: (str, str) -> None
|
||||
# type: (str, HiddenText) -> None
|
||||
"""
|
||||
Clean up current location and download the url repository
|
||||
(and vcs infos) into location
|
||||
@@ -523,6 +734,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def get_remote_url(cls, location):
|
||||
# type: (str) -> str
|
||||
"""
|
||||
Return the url used at location
|
||||
|
||||
@@ -533,6 +745,7 @@ class VersionControl(object):
|
||||
|
||||
@classmethod
|
||||
def get_revision(cls, location):
|
||||
# type: (str) -> str
|
||||
"""
|
||||
Return the current commit id of the files at the given location.
|
||||
"""
|
||||
@@ -541,14 +754,11 @@ class VersionControl(object):
|
||||
@classmethod
|
||||
def run_command(
|
||||
cls,
|
||||
cmd, # type: List[str]
|
||||
show_stdout=True, # type: bool
|
||||
cmd, # type: Union[List[str], CommandArgs]
|
||||
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
|
||||
"""
|
||||
@@ -556,23 +766,20 @@ class VersionControl(object):
|
||||
This is simply a wrapper around call_subprocess that adds the VCS
|
||||
command name, and checks that the VCS is available
|
||||
"""
|
||||
cmd = [cls.name] + cmd
|
||||
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
|
||||
# In other words, the VCS executable isn't available
|
||||
if e.errno == errno.ENOENT:
|
||||
raise BadCommand(
|
||||
'Cannot find command %r - do you have '
|
||||
'%r installed and in your '
|
||||
'PATH?' % (cls.name, cls.name))
|
||||
'Cannot find command {cls.name!r} - do you have '
|
||||
'{cls.name!r} installed and in your '
|
||||
'PATH?'.format(**locals()))
|
||||
else:
|
||||
raise # re-raise exception if a different error occurred
|
||||
|
||||
@@ -587,14 +794,18 @@ class VersionControl(object):
|
||||
return os.path.exists(os.path.join(path, cls.dirname))
|
||||
|
||||
@classmethod
|
||||
def controls_location(cls, location):
|
||||
# type: (str) -> bool
|
||||
def get_repository_root(cls, location):
|
||||
# type: (str) -> Optional[str]
|
||||
"""
|
||||
Check if a location is controlled by the vcs.
|
||||
Return the "root" (top-level) directory controlled by the vcs,
|
||||
or `None` if the directory is not in any.
|
||||
|
||||
It is meant to be overridden to implement smarter detection
|
||||
mechanisms for specific vcs.
|
||||
|
||||
This can do more than is_repository_directory() alone. For example,
|
||||
the Git override checks that Git is actually available.
|
||||
This can do more than is_repository_directory() alone. For
|
||||
example, the Git override checks that Git is actually available.
|
||||
"""
|
||||
return cls.is_repository_directory(location)
|
||||
if cls.is_repository_directory(location):
|
||||
return location
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user