Merge pull request #8378 from uranusjr/direct-url-fix

Fix direct URL by always passing the template’s URL values into candidate

Author: pfmoore

src/pip/_internal/resolution/resolvelib/candidates.py

@@ -58,9 +58,8 @@ def make_install_req_from_link(link, template):
             hashes=template.hash_options
         ),
     )
-    if ireq.link is None:
-        ireq.link = link
-    # TODO: Handle wheel cache resolution.
+    ireq.original_link = template.original_link
+    ireq.link = link
     return ireq
 
 

tests/functional/test_install_direct_url.py

@@ -1,7 +1,5 @@
 import re
 
-import pytest
-
 from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
 from tests.lib import _create_test_package, path_to_url
 
@@ -32,7 +30,6 @@ def test_install_vcs_editable_no_direct_url(script, with_wheel):
     assert not _get_created_direct_url(result, "testpkg")
 
 
-@pytest.mark.fails_on_new_resolver
 def test_install_vcs_non_editable_direct_url(script, with_wheel):
     pkg_path = _create_test_package(script, name="testpkg")
     url = path_to_url(pkg_path)