Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for --skip-lock #5368

Merged
merged 12 commits into from
Sep 21, 2022
Merged

Fix for --skip-lock #5368

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4383328
Attempt at plette loading the Pipfile data for default and develop.
matteius Sep 21, 2022
1e3e109
Plette compatability change.
matteius Sep 21, 2022
ea051b4
Prep for plette vendoring.
matteius Sep 21, 2022
e514767
Port change from safety vendoring PR to make the vendor renames work …
matteius Sep 21, 2022
2e51612
Port change from safety vendoring PR to make the vendor renames work …
matteius Sep 21, 2022
0e5e4ea
Port change from safety vendoring PR to make the vendor renames work …
matteius Sep 21, 2022
4f451be
undo attempt at vendoring change.
matteius Sep 21, 2022
88d1670
Add missing licenses.
matteius Sep 21, 2022
e35f67c
Merge branch 'issue-5367b' of github.com:pypa/pipenv into issue-5367b
matteius Sep 21, 2022
2b1e270
Add test.
matteius Sep 21, 2022
450cc59
Undo this vendoring change.
matteius Sep 21, 2022
370b9da
Add news fragment.
matteius Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pipenv/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2763,6 +2763,7 @@ def do_check(
# Run the PEP 508 checker in the virtualenv.
cmd = _cmd + [Path(pep508checker_path).as_posix()]
c = run_command(cmd, is_verbose=project.s.is_verbose())
results = []
if c.returncode is not None:
try:
results = simplejson.loads(c.stdout.strip())
Expand Down
4 changes: 3 additions & 1 deletion pipenv/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,9 @@ def _lockfile(self):
lock_section = lockfile.get(section, {})
for key in list(lock_section.keys()):
norm_key = pep423_name(key)
lockfile[section][norm_key] = lock_section.pop(key)
specifier = lock_section[key]
del lock_section[key]
lockfile[section][norm_key] = specifier

return lockfile._data

Expand Down
4 changes: 2 additions & 2 deletions pipenv/vendor/plette/lockfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def with_meta_from(cls, pipfile):
"requires": _copy_jsonsafe(pipfile._data.get("requires", {})),
"sources": _copy_jsonsafe(pipfile.sources._data),
},
"default": {},
"develop": {},
"default": _copy_jsonsafe(pipfile._data.get("packages", {})),
"develop": _copy_jsonsafe(pipfile._data.get("dev-packages", {})),
}
return cls(data)

Expand Down