update message for MetadataIncohsistent to allow use with PEP 658 met…

…adata
pypa · Sep 7, 2022 · 036bfc0 · 036bfc0
1 parent fc9bcdd
commit 036bfc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
@@ -335,8 +335,8 @@ class MetadataInconsistent(InstallationError):
     """Built metadata contains inconsistent information.
 
     This is raised when the metadata contains values (e.g. name and version)
-    that do not match the information previously obtained from sdist filename
-    or user-supplied ``#egg=`` value.
+    that do not match the information previously obtained from sdist filename,
+    user-supplied ``#egg=`` value, or an install requirement name.
     """
 
     def __init__(
@@ -349,8 +349,7 @@ def __init__(
 
     def __str__(self) -> str:
         template = (
-            "Requested {} has inconsistent {}: "
-            "filename has {!r}, but metadata has {!r}"
+            "Requested {} has inconsistent {}: expected {!r}, but metadata has {!r}"
         )
         return template.format(self.ireq, self.field, self.f_val, self.m_val)
 

diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
@@ -1363,7 +1363,7 @@ def test_new_resolver_skip_inconsistent_metadata(script: PipTestEnvironment) ->
     )
 
     assert (
-        " inconsistent version: filename has '3', but metadata has '2'"
+        " inconsistent version: expected '3', but metadata has '2'"
     ) in result.stdout, str(result)
     script.assert_installed(a="1")