Eliminado venv y www del repositorio, agrege un requirements igual
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
# The following comment should be removed at some point in the future.
|
||||
# mypy: disallow-untyped-defs=False
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
||||
import logging
|
||||
@@ -8,14 +11,24 @@ 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
|
||||
from pip._internal.utils.compat import samefile
|
||||
from pip._internal.utils.misc import display_path, redact_password_from_url
|
||||
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
|
||||
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
|
||||
from pip._internal.vcs.versioncontrol import (
|
||||
RemoteNotFoundError, VersionControl, vcs,
|
||||
RemoteNotFoundError,
|
||||
VersionControl,
|
||||
find_path_to_setup_from_repo_root,
|
||||
vcs,
|
||||
)
|
||||
|
||||
if MYPY_CHECK_RUNNING:
|
||||
from typing import Optional, Tuple
|
||||
from pip._internal.utils.misc import HiddenText
|
||||
from pip._internal.vcs.versioncontrol import AuthInfo, RevOptions
|
||||
|
||||
|
||||
urlsplit = urllib_parse.urlsplit
|
||||
urlunsplit = urllib_parse.urlunsplit
|
||||
|
||||
@@ -46,9 +59,26 @@ class Git(VersionControl):
|
||||
def get_base_rev_args(rev):
|
||||
return [rev]
|
||||
|
||||
def is_immutable_rev_checkout(self, url, dest):
|
||||
# type: (str, str) -> bool
|
||||
_, rev_options = self.get_url_rev_options(hide_url(url))
|
||||
if not rev_options.rev:
|
||||
return False
|
||||
if not self.is_commit_id_equal(dest, rev_options.rev):
|
||||
# the current commit is different from rev,
|
||||
# which means rev was something else than a commit hash
|
||||
return False
|
||||
# return False in the rare case rev is both a commit hash
|
||||
# and a tag or a branch; we don't want to cache in that case
|
||||
# because that branch/tag could point to something else in the future
|
||||
is_tag_or_branch = bool(
|
||||
self.get_revision_sha(dest, rev_options.rev)[0]
|
||||
)
|
||||
return not is_tag_or_branch
|
||||
|
||||
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:
|
||||
@@ -71,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()
|
||||
|
||||
@@ -81,6 +111,7 @@ class Git(VersionControl):
|
||||
return None
|
||||
|
||||
def export(self, location, url):
|
||||
# type: (str, HiddenText) -> None
|
||||
"""Export the Git repository at the url to the destination location"""
|
||||
if not location.endswith('/'):
|
||||
location = location + '/'
|
||||
@@ -89,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
|
||||
@@ -103,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:
|
||||
@@ -129,6 +165,7 @@ class Git(VersionControl):
|
||||
|
||||
@classmethod
|
||||
def resolve_revision(cls, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> RevOptions
|
||||
"""
|
||||
Resolve a revision to a new RevOptions object with the SHA1 of the
|
||||
branch, tag, or ref if found.
|
||||
@@ -137,6 +174,10 @@ class Git(VersionControl):
|
||||
rev_options: a RevOptions object.
|
||||
"""
|
||||
rev = rev_options.arg_rev
|
||||
# The arg_rev property's implementation for Git ensures that the
|
||||
# rev return value is always non-None.
|
||||
assert rev is not None
|
||||
|
||||
sha, is_branch = cls.get_revision_sha(dest, rev)
|
||||
|
||||
if sha is not None:
|
||||
@@ -158,7 +199,7 @@ class Git(VersionControl):
|
||||
|
||||
# If it looks like a ref, we have to fetch it explicitly.
|
||||
cls.run_command(
|
||||
['fetch', '-q', url] + rev_options.to_args(),
|
||||
make_command('fetch', '-q', url, rev_options.to_args()),
|
||||
cwd=dest,
|
||||
)
|
||||
# Change the revision to the SHA of the ref we fetched
|
||||
@@ -183,12 +224,10 @@ class Git(VersionControl):
|
||||
return cls.get_revision(dest) == name
|
||||
|
||||
def fetch_new(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
rev_display = rev_options.to_display()
|
||||
logger.info(
|
||||
'Cloning %s%s to %s', redact_password_from_url(url),
|
||||
rev_display, display_path(dest),
|
||||
)
|
||||
self.run_command(['clone', '-q', url, dest])
|
||||
logger.info('Cloning %s%s to %s', url, rev_display, display_path(dest))
|
||||
self.run_command(make_command('clone', '-q', url, dest))
|
||||
|
||||
if rev_options.rev:
|
||||
# Then a specific revision was requested.
|
||||
@@ -198,7 +237,9 @@ class Git(VersionControl):
|
||||
# Only do a checkout if the current commit id doesn't match
|
||||
# the requested revision.
|
||||
if not self.is_commit_id_equal(dest, rev_options.rev):
|
||||
cmd_args = ['checkout', '-q'] + rev_options.to_args()
|
||||
cmd_args = make_command(
|
||||
'checkout', '-q', rev_options.to_args(),
|
||||
)
|
||||
self.run_command(cmd_args, cwd=dest)
|
||||
elif self.get_current_branch(dest) != branch_name:
|
||||
# Then a specific branch was requested, and that branch
|
||||
@@ -213,13 +254,18 @@ class Git(VersionControl):
|
||||
self.update_submodules(dest)
|
||||
|
||||
def switch(self, dest, url, rev_options):
|
||||
self.run_command(['config', 'remote.origin.url', url], cwd=dest)
|
||||
cmd_args = ['checkout', '-q'] + rev_options.to_args()
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
self.run_command(
|
||||
make_command('config', 'remote.origin.url', url),
|
||||
cwd=dest,
|
||||
)
|
||||
cmd_args = make_command('checkout', '-q', rev_options.to_args())
|
||||
self.run_command(cmd_args, cwd=dest)
|
||||
|
||||
self.update_submodules(dest)
|
||||
|
||||
def update(self, dest, url, rev_options):
|
||||
# type: (str, HiddenText, RevOptions) -> None
|
||||
# First fetch changes from the default remote
|
||||
if self.get_git_version() >= parse_version('1.9.0'):
|
||||
# fetch tags in addition to everything else
|
||||
@@ -228,7 +274,7 @@ class Git(VersionControl):
|
||||
self.run_command(['fetch', '-q'], cwd=dest)
|
||||
# Then reset to wanted revision (maybe even origin/master)
|
||||
rev_options = self.resolve_revision(dest, url, rev_options)
|
||||
cmd_args = ['reset', '--hard', '-q'] + rev_options.to_args()
|
||||
cmd_args = make_command('reset', '--hard', '-q', rev_options.to_args())
|
||||
self.run_command(cmd_args, cwd=dest)
|
||||
#: update submodules
|
||||
self.update_submodules(dest)
|
||||
@@ -245,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:
|
||||
@@ -265,39 +311,28 @@ 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()
|
||||
|
||||
@classmethod
|
||||
def get_subdirectory(cls, location):
|
||||
"""
|
||||
Return the path to setup.py, relative to the repo root.
|
||||
Return None if setup.py is in the repo root.
|
||||
"""
|
||||
# find the repo root
|
||||
git_dir = cls.run_command(['rev-parse', '--git-dir'],
|
||||
show_stdout=False, cwd=location).strip()
|
||||
git_dir = cls.run_command(
|
||||
['rev-parse', '--git-dir'],
|
||||
cwd=location).strip()
|
||||
if not os.path.isabs(git_dir):
|
||||
git_dir = os.path.join(location, git_dir)
|
||||
root_dir = os.path.join(git_dir, '..')
|
||||
# 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
|
||||
# relative path of setup.py to repo root
|
||||
if samefile(root_dir, location):
|
||||
return None
|
||||
return os.path.relpath(location, root_dir)
|
||||
repo_root = os.path.abspath(os.path.join(git_dir, '..'))
|
||||
return find_path_to_setup_from_repo_root(location, repo_root)
|
||||
|
||||
@classmethod
|
||||
def get_url_rev_and_auth(cls, url):
|
||||
# type: (str) -> Tuple[str, Optional[str], AuthInfo]
|
||||
"""
|
||||
Prefixes stub URLs like 'user@hostname:user/repo.git' with 'ssh://'.
|
||||
That's required because although they use SSH they sometimes don't
|
||||
@@ -340,19 +375,23 @@ class Git(VersionControl):
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def controls_location(cls, location):
|
||||
if super(Git, cls).controls_location(location):
|
||||
return True
|
||||
def get_repository_root(cls, location):
|
||||
loc = super(Git, cls).get_repository_root(location)
|
||||
if loc:
|
||||
return loc
|
||||
try:
|
||||
r = cls.run_command(['rev-parse'],
|
||||
cwd=location,
|
||||
show_stdout=False,
|
||||
on_returncode='ignore')
|
||||
return not r
|
||||
r = cls.run_command(
|
||||
['rev-parse', '--show-toplevel'],
|
||||
cwd=location,
|
||||
log_failed_cmd=False,
|
||||
)
|
||||
except BadCommand:
|
||||
logger.debug("could not determine if %s is under git control "
|
||||
"because git is not available", location)
|
||||
return False
|
||||
return None
|
||||
except SubProcessError:
|
||||
return None
|
||||
return os.path.normpath(r.rstrip('\r\n'))
|
||||
|
||||
|
||||
vcs.register(Git)
|
||||
|
||||
Reference in New Issue
Block a user