Don't add the constraints to the other package categories (rework test)

Author: matteius

Diff for: pipenv/routines/update.py

@@ -286,6 +286,12 @@ def upgrade(
 
     package_args = list(packages) + [f"-e {pkg}" for pkg in editable_packages]
 
+    # Track which packages were explicitly requested for which categories
+    explicitly_requested = {}
+    for package in packages or []:
+        package_name = package.split("==")[0] if "==" in package else package
+        explicitly_requested[package_name] = categories[:]  # Copy the original categories
+
     # Check if we need to update packages in all categories
     # This is needed when a package is specified in one category but also used in others
     if packages:
@@ -295,6 +301,7 @@ def upgrade(
         ]
 
         # Check if any of the packages to upgrade are also in other categories
+        additional_categories = []
         for category in all_lockfile_categories:
             if category in categories:
                 continue  # Skip categories already in the list
@@ -304,12 +311,15 @@ def upgrade(
                 package_name = package.split("==")[0] if "==" in package else package
                 if package_name in category_section:
                     # If the package is also in this category, add it to categories
-                    categories.append(category)
+                    additional_categories.append(category)
                     err.print(
                         f"[bold][green]Package {package_name} found in {category} section, will update there too.[/bold][/green]"
                     )
                     break
 
+        # Add all additional categories at once to avoid duplicates
+        categories.extend(additional_categories)
+
     # Early conflict detection
     conflicts_found = False
     for package in package_args:
@@ -355,8 +365,12 @@ def upgrade(
                 install_req, package, category=pipfile_category, index_name=index_name
             )
 
-            # Only add to Pipfile if explicitly requested
-            if has_package_args:
+            # Only add to Pipfile if this category was explicitly requested for this package
+            # This prevents adding packages to categories where they're only implicit dependencies
+            if has_package_args and (
+                normalized_name not in explicitly_requested
+                or category in explicitly_requested.get(normalized_name, [])
+            ):
                 project.add_pipfile_entry_to_pipfile(
                     name, normalized_name, pipfile_entry, category=pipfile_category
                 )

Diff for: tests/integration/test_upgrade.py

@@ -106,20 +106,17 @@ def test_pipenv_dependency_incompatibility_resolution(pipenv_instance_pypi):
 
 
 @pytest.mark.upgrade
-def test_upgrade_updates_package_in_all_categories(pipenv_instance_private_pypi):
-    """Test that upgrading a package updates it in all categories where it appears."""
+def test_upgrade_updates_lockfile_in_all_categories(pipenv_instance_private_pypi):
+    """Test that upgrading a package updates it in all categories of the lockfile."""
     with pipenv_instance_private_pypi() as p:
-        # Create a Pipfile with a package in multiple categories
+        # Create a Pipfile with a package in default and a dev package that depends on it
         with open(p.pipfile_path, "w") as f:
             contents = """
 [packages]
-six = "==1.11.0"
+requests = "==2.25.0"
 
 [dev-packages]
-six = "==1.11.0"
-
-[custom-category]
-six = "==1.11.0"
+pytest = "*"
             """.strip()
             f.write(contents)
 
@@ -132,24 +129,84 @@ def test_upgrade_updates_package_in_all_categories(pipenv_instance_private_pypi)
         with open(lockfile_path) as lockfile:
             lock_data = json.load(lockfile)
 
-        # Check initial versions in all categories
-        assert lock_data["default"]["six"]["version"] == "==1.11.0"
-        assert lock_data["develop"]["six"]["version"] == "==1.11.0"
+        # Check initial version in default section
+        assert lock_data["default"]["requests"]["version"] == "==2.25.0"
 
-        # Get the lockfile section for the custom category
-        custom_section = get_lockfile_section_using_pipfile_category("custom-category")
-        assert lock_data[custom_section]["six"]["version"] == "==1.11.0"
+        # Check if requests is in develop section (as a dependency of pytest)
+        # If it's there, note its initial version
+        develop_has_requests = "requests" in lock_data["develop"]
+        if develop_has_requests:
+            initial_dev_version = lock_data["develop"]["requests"]["version"]
 
         # Upgrade the package
-        target_version = "1.16.0"
-        c = p.pipenv(f"upgrade six=={target_version}")
-        assert c.returncode == 0, f"Failed to upgrade six: {c.stderr}"
+        target_version = "2.28.0"
+        c = p.pipenv(f"upgrade requests=={target_version}")
+        assert c.returncode == 0, f"Failed to upgrade requests: {c.stderr}"
 
-        # Verify the package was updated in all categories
+        # Verify the package was updated in the lockfile
         with open(lockfile_path) as lockfile:
             updated_lock_data = json.load(lockfile)
 
-        # Check updated versions in all categories
-        assert updated_lock_data["default"]["six"]["version"] == f"=={target_version}"
-        assert updated_lock_data["develop"]["six"]["version"] == f"=={target_version}"
-        assert updated_lock_data[custom_section]["six"]["version"] == f"=={target_version}"
+        # Check updated version in default section
+        assert updated_lock_data["default"]["requests"]["version"] == f"=={target_version}"
+        
+        # If requests was in develop section, check it was updated there too
+        if develop_has_requests:
+            assert updated_lock_data["develop"]["requests"]["version"] == f"=={target_version}"
+
+
+@pytest.mark.upgrade
+def test_upgrade_only_adds_to_explicit_categories(pipenv_instance_private_pypi):
+    """Test that upgrading a package only adds it to the Pipfile for explicitly requested categories."""
+    with pipenv_instance_private_pypi() as p:
+        # Create a Pipfile with a package in default but not in dev-packages
+        with open(p.pipfile_path, "w") as f:
+            contents = """
+[packages]
+requests = "==2.25.0"
+
+[dev-packages]
+pytest = "*"
+            """.strip()
+            f.write(contents)
+        
+        # Lock the dependencies
+        c = p.pipenv("lock")
+        assert c.returncode == 0, f"Failed to lock dependencies: {c.stderr}"
+        
+        # Verify initial state
+        with open(p.pipfile_path) as pipfile:
+            initial_pipfile_content = pipfile.read()
+        
+        # Make sure requests is not in dev-packages initially
+        assert "requests" not in initial_pipfile_content.split("[dev-packages]")[1].split("[")[0]
+        
+        # Upgrade the package
+        target_version = "2.28.0"
+        c = p.pipenv(f"upgrade requests=={target_version}")
+        assert c.returncode == 0, f"Failed to upgrade requests: {c.stderr}"
+        
+        # Verify the Pipfile was updated correctly
+        with open(p.pipfile_path) as pipfile:
+            updated_pipfile_content = pipfile.read()
+        
+        # Check that requests was updated in packages section
+        packages_section = updated_pipfile_content.split("[packages]")[1].split("[")[0]
+        assert f'requests = "=={target_version}"' in packages_section
+        
+        # Check that requests was NOT added to dev-packages section
+        dev_packages_section = updated_pipfile_content.split("[dev-packages]")[1].split("[")[0] if "[dev-packages]" in updated_pipfile_content else ""
+        assert "requests" not in dev_packages_section
+        
+        # Verify the lockfile was updated in both sections
+        lockfile_path = os.path.join(p.path, "Pipfile.lock")
+        with open(lockfile_path) as lockfile:
+            updated_lock_data = json.load(lockfile)
+        
+        # Check that requests was updated in default section
+        assert updated_lock_data["default"]["requests"]["version"] == f"=={target_version}"
+        
+        # Check if requests is in develop section (it might be there as a dependency of pytest)
+        if "requests" in updated_lock_data["develop"]:
+            # If it's there, it should be updated
+            assert updated_lock_data["develop"]["requests"]["version"] == f"=={target_version}"