Fix for skip-lock installing wrong package version when pipfile entry…

… is not a dict
pypa · Oct 29, 2024 · a3165dc · a3165dc
1 parent 0d7160e
commit a3165dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
@@ -463,7 +463,6 @@ def do_install_dependencies(
                 install_req, markers, req_line = install_req_from_pipfile(
                     req_name, pipfile_entry
                 )
-                req_line = f"{req_line}; {markers}" if markers else f"{req_line}"
                 deps_list.append(
                     (
                         install_req,

diff --git a/pipenv/utils/dependencies.py b/pipenv/utils/dependencies.py
@@ -1156,6 +1156,8 @@ def install_req_from_pipfile(name: str, pipfile: Dict[str, Any]) -> Tuple[Any, A
         vcs = next(iter([vcs for vcs in VCS_LIST if pipfile.startswith(f"{vcs}+")]), None)
         if vcs is not None:
             _pipfile[vcs] = pipfile
+        else:  # normal named requirement
+            _pipfile["version"] = pipfile
 
     extras = _pipfile.get("extras", [])
     extras_str = f"[{','.join(extras)}]" if extras else ""
@@ -1217,8 +1219,6 @@ def handle_non_vcs_requirement(
         return file_path_from_pipfile(_pipfile["file"], _pipfile)
     else:
         version = get_version(_pipfile)
-        if version and not is_star(version) and COMPARE_OP.match(version) is None:
-            version = f"=={version}"
         if is_star(version) or version == "==*":
             version = ""