Fix for sys platform markers from Pipfile + fix for vcs subdirectory …

…fragments (#5871)

* Fix not considering sys platform markers from Pipfile
* Fix for handling vcs subdirectory fragments
* Add news fragments

news/5870.bugfix.rst

@@ -0,0 +1 @@
+Fix recent regressions with local/editable file installs.

news/5871.bugfix.rst

@@ -0,0 +1 @@
+Fixes the vcs subdirectory fragments regression; fixes sys_platform markers regression.

pipenv/project.py

@@ -1146,6 +1146,10 @@ def generate_package_pipfile_entry(self, package, pip_line, category=None):
                     vcs_parts = vcs_part.rsplit("@", 1)
                     entry["ref"] = vcs_parts[1].split("#", 1)[0].strip()
                     entry[vcs] = vcs_parts[0].strip()
+
+                    # Check and extract subdirectory fragment
+                    if package.link.subdirectory_fragment:
+                        entry["subdirectory"] = package.link.subdirectory_fragment
                     break
         else:
             entry["version"] = specifier

pipenv/utils/dependencies.py

@@ -246,6 +246,8 @@ def clean_resolved_dep(project, dep, is_top_level=False, current_entry=None):
             else:
                 lockfile[vcs_type] = dep[vcs_type]
             lockfile["ref"] = dep.get("ref")
+            if "subdirectory" in dep:
+                lockfile["subdirectory"] = dep["subdirectory"]
             is_vcs_or_file = True
 
     if "editable" in dep:
@@ -965,6 +967,9 @@ def install_req_from_pipfile(name, pipfile):
 
     if vcs:
         vcs_url = _pipfile[vcs]
+        subdirectory = _pipfile.get("subdirectory", "")
+        if subdirectory:
+            subdirectory = f"#subdirectory={subdirectory}"
         fallback_ref = ""
         if ("ssh://" in vcs_url and vcs_url.count("@") >= 2) or (
             "ssh://" not in vcs_url and "@" in vcs_url
@@ -977,9 +982,11 @@ def install_req_from_pipfile(name, pipfile):
         if not req_str.startswith(f"{vcs}+"):
             req_str = f"{vcs}+{req_str}"
         if f"{vcs}+file://" in req_str:
-            req_str = f"-e {req_str}#egg={name}{extras_str}"
+            req_str = (
+                f"-e {req_str}#egg={name}{extras_str}{subdirectory.replace('#', '&')}"
+            )
         else:
-            req_str = f"{name}{extras_str}@ {req_str}"
+            req_str = f"{name}{extras_str}@ {req_str}{subdirectory}"
     elif "path" in _pipfile:
         req_str = str(Path(_pipfile["path"]).as_posix())
     elif "file" in _pipfile:

pipenv/utils/locking.py

@@ -65,6 +65,8 @@ def format_requirement_for_lockfile(
             entry[vcs] = original_deps[name]
         else:
             entry[vcs] = req.link.url
+        if pipfile_entry.get("subdirectory"):
+            entry["subdirectory"] = pipfile_entry["subdirectory"]
     if req.req:
         entry["version"] = str(req.specifier)
     elif version:

pipenv/utils/markers.py

@@ -35,14 +35,6 @@ class PipenvMarkers(BaseModel):
     implementation_name: Optional[str] = None
     implementation_version: Optional[str] = None
 
-    @property
-    def line_part(self):
-        return " and ".join([f"{k} {v}" for k, v in self.dict().items() if v is not None])
-
-    @property
-    def pipfile_part(self):
-        return {"markers": self.as_line}
-
     @classmethod
     def make_marker(cls, marker_string):
         try:
@@ -53,20 +45,15 @@ def make_marker(cls, marker_string):
             )
         return marker
 
-    @classmethod
-    def from_line(cls, line):
-        if ";" in line:
-            line = line.rsplit(";", 1)[1].strip()
-        marker = cls.make_marker(line)
-        return marker
-
     @classmethod
     def from_pipfile(cls, name, pipfile):
         attr_fields = list(cls.__fields__)
         found_keys = [k for k in pipfile.keys() if k in attr_fields]
         marker_strings = [f"{k} {pipfile[k]}" for k in found_keys]
         if pipfile.get("markers"):
             marker_strings.append(pipfile.get("markers"))
+        if pipfile.get("sys_platform"):
+            marker_strings.append(f"sys_platform '{pipfile['sys_platform']}'")
         markers = set()
         for marker in marker_strings:
             markers.add(marker)

pipenv/utils/requirements.py

@@ -151,6 +151,18 @@ def requirement_from_lockfile(
             return f"{package_name}=={package_info}"
         else:
             return package_name
+
+    markers = (
+        "; {}".format(package_info["markers"])
+        if include_markers and "markers" in package_info and package_info["markers"]
+        else ""
+    )
+    os_markers = (
+        "; {}".format(package_info["os_markers"])
+        if include_markers and "os_markers" in package_info and package_info["os_markers"]
+        else ""
+    )
+
     # Handling vcs repositories
     for vcs in VCS_LIST:
         if vcs in package_info:
@@ -171,13 +183,16 @@ def requirement_from_lockfile(
                 if "extras" in package_info
                 else ""
             )
+            subdirectory = package_info.get("subdirectory", "")
             include_vcs = "" if f"{vcs}+" in url else f"{vcs}+"
             egg_fragment = "" if "#egg=" in url else f"#egg={package_name}"
             ref_str = "" if not ref or f"@{ref}" in url else f"@{ref}"
             if is_editable_path(url) or "file://" in url:
                 pip_line = f"-e {include_vcs}{url}{ref_str}{egg_fragment}{extras}"
+                pip_line += f"&subdirectory={subdirectory}" if subdirectory else ""
             else:
                 pip_line = f"{package_name}{extras}@ {include_vcs}{url}{ref_str}"
+                pip_line += f"#subdirectory={subdirectory}" if subdirectory else ""
             return pip_line
     # Handling file-sourced packages
     for k in ["file", "path"]:
@@ -187,6 +202,10 @@ def requirement_from_lockfile(
             if is_editable_path(path):
                 line.append("-e")
             line.append(f"{package_info[k]}")
+            if os_markers:
+                line.append(os_markers)
+            if markers:
+                line.append(markers)
             pip_line = " ".join(line)
             return pip_line
 
@@ -197,16 +216,6 @@ def requirement_from_lockfile(
         if include_hashes and "hashes" in package_info
         else ""
     )
-    markers = (
-        "; {}".format(package_info["markers"])
-        if include_markers and "markers" in package_info and package_info["markers"]
-        else ""
-    )
-    os_markers = (
-        "; {}".format(package_info["os_markers"])
-        if include_markers and "os_markers" in package_info and package_info["os_markers"]
-        else ""
-    )
     extras = (
         "[{}]".format(",".join(package_info.get("extras", [])))
         if "extras" in package_info