mirror of https://github.com/pypa/pip
Refactor the logging calls into a dedicated loop
This commit is contained in:
parent
c6936ad4e1
commit
d77b5c234c
|
@ -539,24 +539,39 @@ class InstallCommand(RequirementCommand):
|
||||||
def _warn_about_conflicts(self, conflict_details):
|
def _warn_about_conflicts(self, conflict_details):
|
||||||
# type: (ConflictDetails) -> None
|
# type: (ConflictDetails) -> None
|
||||||
package_set, (missing, conflicting) = conflict_details
|
package_set, (missing, conflicting) = conflict_details
|
||||||
|
parts = [] # type: List[str]
|
||||||
|
|
||||||
# NOTE: There is some duplication here, with commands/check.py
|
# NOTE: There is some duplication here, with commands/check.py
|
||||||
for project_name in missing:
|
for project_name in missing:
|
||||||
version = package_set[project_name][0]
|
version = package_set[project_name][0]
|
||||||
for dependency in missing[project_name]:
|
for dependency in missing[project_name]:
|
||||||
logger.critical(
|
message = (
|
||||||
"%s %s requires %s, which is not installed.",
|
"{name} {version} requires {requirement}, "
|
||||||
project_name, version, dependency[1],
|
"which is not installed."
|
||||||
|
).format(
|
||||||
|
name=project_name,
|
||||||
|
version=version,
|
||||||
|
requirement=dependency[1],
|
||||||
)
|
)
|
||||||
|
parts.append(message)
|
||||||
|
|
||||||
for project_name in conflicting:
|
for project_name in conflicting:
|
||||||
version = package_set[project_name][0]
|
version = package_set[project_name][0]
|
||||||
for dep_name, dep_version, req in conflicting[project_name]:
|
for dep_name, dep_version, req in conflicting[project_name]:
|
||||||
logger.critical(
|
message = (
|
||||||
"%s %s has requirement %s, but you'll have %s %s which is "
|
"{name} {version} requires {requirement}, but you'll have "
|
||||||
"incompatible.",
|
"{dep_name} {dep_version} which is incompatible."
|
||||||
project_name, version, req, dep_name, dep_version,
|
).format(
|
||||||
|
name=project_name,
|
||||||
|
version=version,
|
||||||
|
requirement=req,
|
||||||
|
dep_name=dep_name,
|
||||||
|
dep_version=dep_version,
|
||||||
)
|
)
|
||||||
|
parts.append(message)
|
||||||
|
|
||||||
|
for message in parts:
|
||||||
|
logger.critical(message)
|
||||||
|
|
||||||
|
|
||||||
def get_lib_location_guesses(
|
def get_lib_location_guesses(
|
||||||
|
|
Loading…
Reference in New Issue