Skip to content

Commit 5701434

Browse files
oz123oz123
committed
fix: when a resolution is failed show a helpful error
Also, exist the program immediately. For example: ``` $ pipenv install bottle==0.16.0 Installing bottle==0.16.0... ✔ Installation Succeeded Installing dependencies from Pipfile.lock (2110f5)... All dependencies are now up-to-date! Upgrading bottle==0.16.0 in dependencies. Building requirements... Resolving dependencies... ✘ Locking Failed! ⠼ Locking packages...CRITICAL:pipenv.patched.pip._internal.resolution.resolvelib.factory:Could not find a version that satisfies the requirement bottle==0.16.0 (from versions: 0.4.3, 0.4.4, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13, 0.4.14, 0.5.3, 0.5.4, 0.5.6, 0.5.7, 0.5.8, 0.6.0, 0.6.1, 0.6.2, 0.6.3, 0.6.4, 0.6.5, 0.6.6, 0.8.1, 0.8.2, 0.8.3, 0.8.4, 0.8.5, 0.9.1, 0.9.2, 0.9.3, 0.9.4, 0.9.5, 0.9.6, 0.9.7, 0.9.8, 0.10.1, 0.10.2, 0.10.3, 0.10.4, 0.10.5, 0.10.6, 0.10.7, 0.10.8, 0.10.9, 0.10.10, 0.10.11, 0.10.12, 0.11.1, 0.11.2, 0.11.3, 0.11.4, 0.11.5, 0.11.6, 0.11.7, 0.12.1, 0.12.2, 0.12.3, 0.12.4, 0.12.5, 0.12.6, 0.12.7, 0.12.8, 0.12.9, 0.12.10, 0.12.11, 0.12.12, 0.12.13, 0.12.14, 0.12.15, 0.12.16, 0.12.17, 0.12.18, 0.12.19, 0.12.20, 0.12.21, 0.12.22, 0.12.23, 0.12.24, 0.12.25, 0.13.0, 0.13.1, 0.13.2) [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 451, in main [ResolutionFailure]: _main( [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 436, in _main [ResolutionFailure]: resolve_packages( [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 400, in resolve_packages [ResolutionFailure]: results, resolver = resolve_deps( [ResolutionFailure]: ^^^^^^^^^^^^^ [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 971, in resolve_deps [ResolutionFailure]: results, hashes, internal_resolver = actually_resolve_deps( [ResolutionFailure]: ^^^^^^^^^^^^^^^^^^^^^^ [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 735, in actually_resolve_deps [ResolutionFailure]: resolver.resolve() [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 460, in resolve [ResolutionFailure]: raise ResolutionFailure(message=e) Your dependencies could not be resolved. You likely have a mismatch in your sub-dependencies. You can use $ pipenv run pip install <requirement_name> to bypass this mechanism, then run $ pipenv graph to inspect the versions actually installed in the virtualenv. Hint: try $ pipenv lock --pre if it is a pre-release dependency. ERROR: No matching distribution found for bottle==0.16.0 ``` Or: ``` oznt@gentoo:/tmp/bla |pipenv-H8EVR25f| $ pipenv install noSuchDog Installing noSuchDog... ✔ Installation Succeeded Installing dependencies from Pipfile.lock (2110f5)... All dependencies are now up-to-date! Upgrading noSuchDog in dependencies. Building requirements... Resolving dependencies... ✘ Locking Failed! ⠹ Locking packages...CRITICAL:pipenv.patched.pip._internal.resolution.resolvelib.factory:Could not find a version that satisfies the requirement nosuchdog (from versions: none) [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 451, in main [ResolutionFailure]: _main( [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 436, in _main [ResolutionFailure]: resolve_packages( [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 400, in resolve_packages [ResolutionFailure]: results, resolver = resolve_deps( [ResolutionFailure]: ^^^^^^^^^^^^^ [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 971, in resolve_deps [ResolutionFailure]: results, hashes, internal_resolver = actually_resolve_deps( [ResolutionFailure]: ^^^^^^^^^^^^^^^^^^^^^^ [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 735, in actually_resolve_deps [ResolutionFailure]: resolver.resolve() [ResolutionFailure]: File "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 460, in resolve [ResolutionFailure]: raise ResolutionFailure(message=e) Your dependencies could not be resolved. You likely have a mismatch in your sub-dependencies. You can use $ pipenv run pip install <requirement_name> to bypass this mechanism, then run $ pipenv graph to inspect the versions actually installed in the virtualenv. Hint: try $ pipenv lock --pre if it is a pre-release dependency. ERROR: No matching distribution found for nosuchdog ``` Signed-off-by: Oz Tiram <[email protected]>
1 parent 94c9658 commit 5701434

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

‎pipenv/exceptions.py

+9-23
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ def show(self, file=None):
7979
if isinstance(self.extra, str):
8080
self.extra = [self.extra]
8181
for extra in self.extra:
82-
extra = f"[pipenv.exceptions.{self.__class__.__name__}]: {extra}"
8382
console.print(extra)
8483
console.print(f"{self.message}")
8584

@@ -310,29 +309,16 @@ def __init__(self, message):
310309
class ResolutionFailure(PipenvException):
311310
def __init__(self, message, no_version_found=False):
312311
extra = (
313-
"{}: Your dependencies could not be resolved. You likely have a "
314-
"mismatch in your sub-dependencies.\n "
315-
"You can use {} to bypass this mechanism, then run "
316-
"{} to inspect the versions actually installed in the virtualenv.\n "
317-
"Hint: try {} if it is a pre-release dependency."
318-
"".format(
319-
click.style("Warning", fg="red", bold=True),
320-
click.style("$ pipenv run pip install <requirement_name>", fg="yellow"),
321-
click.style("$ pipenv graph", fg="yellow"),
322-
click.style("$ pipenv lock --pre", fg="yellow"),
323-
),
312+
"Your dependencies could not be resolved. You likely have a "
313+
"mismatch in your sub-dependencies.\n"
314+
"You can use [yellow]$ pipenv run pip install <requirement_name>[/yellow] to bypass this mechanism, then run "
315+
"[yellow]$ pipenv graph[/yellow] to inspect the versions actually installed in the virtualenv.\n"
316+
"Hint: try [yellow]$ pipenv lock --pre[/yellow] if it is a pre-release dependency."
324317
)
325-
if "no version found at all" in message:
326-
no_version_found = True
327-
message = click.style(f"{message}", fg="yellow")
328-
if no_version_found:
329-
message = "{}\n{}".format(
330-
message,
331-
click.style(
332-
"Please check your version specifier and version number. "
333-
"See PEP440 for more information.",
334-
fg="cyan",
335-
),
318+
if "no version found at all" in str(message):
319+
message += (
320+
"[cyan]Please check your version specifier and version number. "
321+
"See PEP440 for more information.[/cyan]"
336322
)
337323
PipenvException.__init__(self, message, extra=extra)
338324

‎pipenv/utils/resolver.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,10 @@ def venv_resolve_deps(
904904
cmd.append("--constraints-file")
905905
cmd.append(constraints_file.name)
906906
st.console.print("Resolving dependencies...")
907-
c = resolve(cmd, st, project=project)
907+
try:
908+
c = resolve(cmd, st, project=project)
909+
except InstallationError:
910+
sys.exit(1)
908911
if c.returncode == 0:
909912
try:
910913
with open(target_file.name) as fh:

0 commit comments

Comments
 (0)