From c24063aaaf9b9218845c7c11e7f92bf54579973e Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 30 Oct 2024 21:25:32 -0400 Subject: [PATCH 1/3] Fix breakage that was almost released --- pipenv/routines/update.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pipenv/routines/update.py b/pipenv/routines/update.py index fc2ba587f..afd3d570c 100644 --- a/pipenv/routines/update.py +++ b/pipenv/routines/update.py @@ -380,21 +380,18 @@ 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 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, + ) - 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: From bb058448fcade2b55ddef8821d1eeefab695b6d7 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 30 Oct 2024 21:28:47 -0400 Subject: [PATCH 2/3] spurious logic --- pipenv/routines/update.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pipenv/routines/update.py b/pipenv/routines/update.py index afd3d570c..6ed79495d 100644 --- a/pipenv/routines/update.py +++ b/pipenv/routines/update.py @@ -392,14 +392,6 @@ def upgrade( pypi_mirror=pypi_mirror, ) - # 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 - # Update lockfile with verified resolution data for package_name in upgrade_lock_data: correct_package_lock = full_lock_resolution.get(package_name) From 99503f869d8617bb9d8217f361b9490f652f5fb3 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 30 Oct 2024 21:40:16 -0400 Subject: [PATCH 3/3] prep actual release --- CHANGELOG.md | 3 ++- pipenv/__version__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e54885f..d0ac72e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -2024.3.0 (2024-10-30) +2024.3.1 (2024-10-30) ===================== Bug Fixes @@ -8,6 +8,7 @@ Bug Fixes - Fix regression of ``2024.3.0`` when using the ``--system`` flag without ``--deploy`` flag. `#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 `_ + 2024.3.0 (2024-10-29) ===================== diff --git a/pipenv/__version__.py b/pipenv/__version__.py index e0a913c5e..fb341458a 100644 --- a/pipenv/__version__.py +++ b/pipenv/__version__.py @@ -2,4 +2,4 @@ # // ) ) / / // ) ) //___) ) // ) ) || / / # //___/ / / / //___/ / // // / / || / / # // / / // ((____ // / / ||/ / -__version__ = "2024.3.1" +__version__ = "2024.3.0"