Skip to content

Fix dev flag support in update/upgrade. #5625

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

Merged
merged 5 commits into from
Mar 13, 2023
Merged

Fix dev flag support in update/upgrade. #5625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad315e0
Fix dev flag support in update/upgrade.
matteius Mar 4, 2023
2719bba
Sometimes an older package in the lock restricts the addition of a ne…
matteius Mar 10, 2023
8e82a9a
Correct issue where pep423 name is added along side non pep423 name a…
matteius Mar 10, 2023
30d2609
restore change that prevents blowing away pipfile category.
matteius Mar 10, 2023
f888e5c
actually pass dev flag state to upgrade command.
matteius Mar 10, 2023
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/cli/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ def upgrade(state, **kwargs):
packages=state.installstate.packages,
editable_packages=state.installstate.editables,
categories=state.installstate.categories,
dev=state.installstate.dev,
system=state.system,
lock_only=state.installstate.lock_only,
)
Expand Down
13 changes: 10 additions & 3 deletions pipenv/routines/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
convert_deps_to_pip,
get_pipfile_category_using_lockfile_section,
is_star,
pep423_name,
)
from pipenv.utils.project import ensure_project
from pipenv.utils.resolver import venv_resolve_deps
Expand Down Expand Up @@ -80,6 +81,7 @@ def do_update(
editable_packages=editable,
pypi_mirror=pypi_mirror,
categories=categories,
dev=dev,
lock_only=lock_only,
)

Expand All @@ -106,13 +108,16 @@ def upgrade(
editable_packages=None,
pypi_mirror=None,
categories=None,
dev=False,
lock_only=False,
):

lockfile = project._lockfile()
if not pre:
pre = project.settings.get("allow_prereleases")
if not categories:
if dev:
categories = ["develop"]
elif not categories:
categories = ["default"]

package_args = [p for p in packages] + [f"-e {pkg}" for pkg in editable_packages]
Expand All @@ -124,6 +129,7 @@ def upgrade(
section = {}
package = Requirement.from_line(package)
package_name, package_val = package.pipfile_entry
package_name = pep423_name(package_name)
requested_packages[package_name] = package
try:
if not is_star(section[package_name]) and is_star(package_val):
Expand Down Expand Up @@ -184,8 +190,9 @@ def upgrade(
)
# Mutate the existing lockfile with the upgrade data for the categories
for package_name, _ in upgrade_lock_data.items():
correct_package_lock = full_lock_resolution[package_name]
lockfile[category][package_name] = correct_package_lock
correct_package_lock = full_lock_resolution.get(package_name)
if correct_package_lock:
lockfile[category][package_name] = correct_package_lock

lockfile.update({"_meta": project.get_lockfile_meta()})
project.write_lockfile(lockfile)