Merge pull request #5555 from pypa/fix-5536

Fix duplicate egg name when adding extras for package install from url

Author: oz123

news/5536.bugfix.rst

@@ -0,0 +1 @@
+Fix for resolution error when direct url includes an extras.

pipenv/vendor/requirementslib/__init__.py

@@ -5,7 +5,7 @@
 from .models.pipfile import Pipfile
 from .models.requirements import Requirement
 
-__version__ = "2.2.2"
+__version__ = "2.2.3"
 
 
 logger = logging.getLogger(__name__)

pipenv/vendor/requirementslib/models/requirements.py

@@ -1831,7 +1831,7 @@ def from_pipfile(cls, name, pipfile):
                 line = "{0}&subdirectory={1}".format(line, pipfile["subdirectory"])
         if editable:
             line = "-e {0}".format(line)
-        arg_dict["parsed_line"] = Line(line)
+        arg_dict["parsed_line"] = Line(line, extras=extras)
         arg_dict["setup_info"] = arg_dict["parsed_line"].setup_info
         return cls(**arg_dict)  # type: ignore
 
@@ -2525,6 +2525,8 @@ def get_line_instance(self):
                 self.is_file_or_url
                 and not local_editable
                 and not self.req.get_uri().startswith("file://")
+                # fix for file uri with egg names and extras
+                and not len(self.req.line_part.split("#")) > 1
             ):
                 line_parts.append(f"#egg={self._name}{self.extras_as_pip}")
             else:

pipenv/vendor/vendor.txt

@@ -12,7 +12,7 @@ ptyprocess==0.7.0
 pyparsing==3.0.9
 python-dotenv==0.19.0
 pythonfinder==1.3.1
-requirementslib==2.2.2
+requirementslib==2.2.3
 ruamel.yaml==0.17.21
 shellingham==1.5.0
 toml==0.10.2

tests/integration/test_install_misc.py

@@ -0,0 +1,24 @@
+import os
+import pytest 
+
+@pytest.mark.urls
+@pytest.mark.extras
+@pytest.mark.install
+def test_install_uri_with_extras(pipenv_instance_private_pypi):
+    file_uri = "http://localhost:8080/packages/plette/plette-0.2.2-py2.py3-none-any.whl"
+    index = os.environ['PIPENV_TEST_INDEX']
+    with pipenv_instance_private_pypi() as p:
+        with open(p.pipfile_path, 'w') as f:
+            contents = """
+[[source]]
+url = "{index}"
+verify_ssl = false
+name = "testindex"
+
+[packages]
+plette = {{file = "{file_uri}", extras = ["validation"]}}
+""".format(file_uri=file_uri, index=index)
+            f.write(contents)
+        c = p.pipenv("install")
+        assert c.returncode == 0
+        assert "plette" in p.lockfile["default"]