Skip to content

Commit

Permalink
Fix breakage that was almost released (#6302)
Browse files Browse the repository at this point in the history
* Fix breakage that was almost released
* remove spurious logic
* and prep for actual release
  • Loading branch information
matteius authored Oct 31, 2024
1 parent 7ef4f16 commit f50b405
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 24 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2024.3.0 (2024-10-30)
2024.3.1 (2024-10-30)
=====================

Bug Fixes
Expand All @@ -8,6 +8,7 @@ Bug Fixes
- Fix regression of ``2024.3.0`` when using the ``--system`` flag without ``--deploy`` flag. `#6295 <https://github.com/pypa/pipenv/issues/6295>`_
- - **Bugfix:** Fixed Regression with the ``pipenv update`` routine to allow for package upgrades without requiring an existing lockfile. This change improves the flexibility of the update process by determining which packages require updating and handling cases where the lockfile is absent or partially defined.
- **Tests Added:** Comprehensive integration tests for the updated functionality, covering scenarios like updating packages without a lockfile, detecting modified entries, handling VCS changes, and verifying the correct application of extras during installation. `#6299 <https://github.com/pypa/pipenv/issues/6299>`_

2024.3.0 (2024-10-29)
=====================

Expand Down
2 changes: 1 addition & 1 deletion pipenv/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# // ) ) / / // ) ) //___) ) // ) ) || / /
# //___/ / / / //___/ / // // / / || / /
# // / / // ((____ // / / ||/ /
__version__ = "2024.3.1"
__version__ = "2024.3.0"
33 changes: 11 additions & 22 deletions pipenv/routines/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,28 +380,17 @@ def upgrade(

complete_packages = project.parsed_pipfile.get(pipfile_category, {})

full_lock_resolution = venv_resolve_deps(
complete_packages,
which=project._which,
project=project,
lockfile={},
pipfile_category=pipfile_category,
pre=pre,
allow_global=system,
pypi_mirror=pypi_mirror,
)

if upgrade_lock_data is None:
for package_name, package_data in full_lock_resolution.items():
lockfile[category][package_name] = package_data
else: # Upgrade a subset of packages
# Verify no conflicts were introduced during resolution
for package_name, package_data in full_lock_resolution.items():
if package_name in upgrade_lock_data:
version = package_data.get("version", "").replace("==", "")
if not version:
# Either vcs or file package
continue
if upgrade_lock_data is not None: # Upgrade a subset of packages
full_lock_resolution = venv_resolve_deps(
complete_packages,
which=project._which,
project=project,
lockfile={},
pipfile_category=pipfile_category,
pre=pre,
allow_global=system,
pypi_mirror=pypi_mirror,
)

# Update lockfile with verified resolution data
for package_name in upgrade_lock_data:
Expand Down

0 comments on commit f50b405

Please sign in to comment.