mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
#4278: Don't pin wildcard versions in lockfile
Fixes bug introduced by552d1274ea, which activated the (unused) changes made much earlier ina08a2da524.
This commit is contained in:
@@ -0,0 +1 @@
|
||||
Fix a bug that caused non-specific versions to be pinned in ``Pipfile.lock``.
|
||||
+1
-1
@@ -1191,7 +1191,7 @@ def get_locked_dep(dep, pipfile_section, prefer_pipfile=True):
|
||||
lockfile_name, lockfile_dict = lockfile_entry.copy().popitem()
|
||||
lockfile_version = lockfile_dict.get("version", "")
|
||||
# Keep pins from the lockfile
|
||||
if prefer_pipfile and lockfile_version != version and version.startswith("=="):
|
||||
if prefer_pipfile and lockfile_version != version and version.startswith("==") and "*" not in version:
|
||||
lockfile_dict["version"] = version
|
||||
lockfile_entry[lockfile_name] = lockfile_dict
|
||||
return lockfile_entry
|
||||
|
||||
@@ -748,3 +748,16 @@ def test_lock_nested_vcs_direct_url(PipenvInstance):
|
||||
assert "git" in p.lockfile["default"]["sibling-package"]
|
||||
assert "subdirectory" in p.lockfile["default"]["sibling-package"]
|
||||
assert "version" not in p.lockfile["default"]["sibling-package"]
|
||||
|
||||
|
||||
@pytest.mark.lock
|
||||
@pytest.mark.install
|
||||
def test_lock_package_with_wildcard_version(PipenvInstance):
|
||||
with PipenvInstance(chdir=True) as p:
|
||||
c = p.pipenv("install 'six==1.11.*'")
|
||||
assert c.ok
|
||||
assert "six" in p.pipfile["packages"]
|
||||
assert p.pipfile["packages"]["six"] == "==1.11.*"
|
||||
assert "six" in p.lockfile["default"]
|
||||
assert "version" in p.lockfile["default"]["six"]
|
||||
assert p.lockfile["default"]["six"]["version"] == "==1.11.0"
|
||||
|
||||
Reference in New Issue
Block a user