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.

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

correct regression in --skip-lock #6304

Merged
merged 4 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Features & Improvements
Behavior Changes
----------------

- ``pipenv==3000.0.0`` denotes the first major release of our semver strategy.
- ``pipenv==2024.0.0`` denotes the first major release of our semver strategy.
As much requested, the ``install`` no longer does a complete lock operation. Instead ``install`` follows the same code path as pipenv update (which is upgrade + sync).
This is what most new users expect the behavior to be; it is a behavioral change, a necessary one to make the tool more usable.
Remember that complete lock resolution can be invoked with ``pipenv lock`` just as before. `#6098 <https://github.com/pypa/pipenv/issues/6098>`_
Expand Down
1 change: 1 addition & 0 deletions news/6304.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression where ``--skip-lock --dev`` was incorrectly searching Lockfile categories ("default", "develop") instead of Pipfile categories ("packages", "dev-packages"), causing packages to not be found.
2 changes: 1 addition & 1 deletion pipenv/routines/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def do_install(

try:
if dev: # Install both develop and default package categories from Pipfile.
pipfile_categories = ["default", "develop"]
pipfile_categories = ["packages", "dev-packages"]
do_install_dependencies(
project,
dev=dev,
Expand Down
44 changes: 44 additions & 0 deletions tests/integration/test_install_twists.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import pytest

from pipenv.utils.shell import temp_environ
from pipenv.vendor.packaging import version


@pytest.mark.extras
Expand Down Expand Up @@ -527,3 +528,46 @@ def test_no_duplicate_source_on_install(pipenv_instance_private_pypi):
assert updated_source_count == source_count, "No new [[source]] sections should be added"
assert "requests" in p.pipfile["packages"]
assert p.pipfile["packages"]["requests"].get("index") is not None


@pytest.mark.basic
@pytest.mark.install
def test_install_dev_with_skip_lock(pipenv_instance_pypi):
"""Test aws-cdk-lib installation and version verification."""
with pipenv_instance_pypi() as p:
# Create the Pipfile with specified contents
with open(p.pipfile_path, "w") as f:
contents = """
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
aws-cdk-lib = "==2.164.1"

[dev-packages]
pytest = "*"
""".strip()
f.write(contents)

# Install dependencies with --skip-lock
c = p.pipenv("install --dev --skip-lock")
assert c.returncode == 0

# Check pip freeze output
c = p.pipenv("run pip freeze")
assert c.returncode == 0
freeze_output = c.stdout.strip()

# Find aws-cdk-lib in pip freeze output and verify version
for line in freeze_output.split('\n'):
if line.startswith('aws-cdk-lib=='):
installed_version = line.split('==')[1]
assert version.parse(installed_version) == version.parse("2.164.1"), \
f"aws-cdk-lib version {installed_version} is to be expected 2.164.1"
break
else:
# This will execute if we don't find aws-cdk-lib in the output
raise AssertionError("aws-cdk-lib not found in pip freeze output")

Loading