Support --dev flag for uninstall (#6392)

* Support --dev flag for uninstall

* Add news fragment for --dev flag in uninstall command

Author: matteius

docs/commands.md

@@ -158,12 +158,20 @@ Uninstall all development packages:
 $ pipenv uninstall --all-dev
 ```
 
+Uninstall a dev package using --dev flag:
+
+```bash
+$ pipenv uninstall ruff --dev
+```
+
 ### Options
 
 | Option | Description |
 |--------|-------------|
 | `--all` | Remove all packages from virtual environment |
 | `--all-dev` | Remove all development packages |
+| `--dev` | Uninstall package from dev-packages section |
+| `--categories` | Specify which categories to uninstall from |
 | `--skip-lock` | Don't update Pipfile.lock after uninstalling |
 
 ## lock

news/6392.feature.rst

@@ -0,0 +1 @@
+Add support for ``--dev`` flag in ``pipenv uninstall`` command to remove packages from ``dev-packages`` section directly.

pipenv/cli/options.py

@@ -186,9 +186,24 @@ def lock_dev_option(f):
 
 
 def uninstall_dev_option(f):
-    return _dev_option(
-        f, "Deprecated (as it has no effect). May be removed in a future release."
-    )
+    def callback(ctx, param, value):
+        state = ctx.ensure_object(State)
+        state.installstate.dev = value
+        if value:
+            state.installstate.categories.append("dev-packages")
+        return value
+
+    return option(
+        "--dev",
+        "-d",
+        is_flag=True,
+        default=False,
+        type=click_types.BOOL,
+        help="Uninstall packages from dev-packages.",
+        callback=callback,
+        expose_value=False,
+        show_envvar=True,
+    )(f)
 
 
 def pre_option(f):

pipenv/project.py

@@ -1179,9 +1179,16 @@ def _sort_category(self, category) -> Table:
 
     def remove_package_from_pipfile(self, package_name, category):
         # Read and append Pipfile.
-        name = self.get_package_name_in_pipfile(package_name, category=category)
         p = self.parsed_pipfile
-        if name:
+        section = p.get(category, {})
+        # Find the actual key in the section that matches the normalized name
+        normalized_name = pep423_name(package_name)
+        name = None
+        for key in section:
+            if pep423_name(key) == normalized_name:
+                name = key
+                break
+        if name and name in section:
             del p[category][name]
             if self.settings.get("sort_pipfile"):
                 p[category] = self._sort_category(p[category])
@@ -1208,7 +1215,8 @@ def remove_packages_from_pipfile(self, packages):
             to_remove = packages & pipfile_packages
             for pkg in to_remove:
                 pkg_name = self.get_package_name_in_pipfile(pkg, category=category)
-                del parsed[category][pkg_name]
+                if pkg_name:
+                    del parsed[category][pkg_name]
         self.write_toml(parsed)
 
     def generate_package_pipfile_entry(

tests/integration/conftest.py

@@ -224,7 +224,7 @@ def __exit__(self, *args):
         self._path = None
 
     def run_command(self, cmd):
-        result = subprocess.run(cmd, shell=True, capture_output=True, check=False)
+        result = subprocess.run(cmd, shell=True, capture_output=True, check=False, cwd=self.path)
         try:
             std_out_decoded = result.stdout.decode("utf-8")
         except UnicodeDecodeError:

tests/integration/test_uninstall_dev.py

@@ -0,0 +1,103 @@
+import pytest
+
+
+@pytest.mark.install
+@pytest.mark.uninstall
+def test_uninstall_dev_flag(pipenv_instance_private_pypi):
+    """Ensure that running `pipenv uninstall --dev` properly removes packages from dev-packages"""
+    with pipenv_instance_private_pypi() as p:
+        with open(p.pipfile_path, "w") as f:
+            contents = """
+[packages]
+six = "*"
+
+[dev-packages]
+pytest = "*"
+            """.strip()
+            f.write(contents)
+
+        # Install both packages
+        c = p.pipenv("install --dev")
+        assert c.returncode == 0
+        assert "six" in p.pipfile["packages"]
+        assert "pytest" in p.pipfile["dev-packages"]
+        assert "six" in p.lockfile["default"]
+        assert "pytest" in p.lockfile["develop"]
+
+        # Verify both packages are installed
+        c = p.pipenv('run python -c "import six, pytest"')
+        assert c.returncode == 0
+
+        # Uninstall pytest with --dev flag
+        c = p.pipenv("uninstall pytest --dev")
+        assert c.returncode == 0
+
+        # Verify pytest was removed from dev-packages
+        assert "six" in p.pipfile["packages"]
+        assert "pytest" not in p.pipfile["dev-packages"]
+        assert "six" in p.lockfile["default"]
+        assert "pytest" not in p.lockfile["develop"]
+
+        # Verify pytest is no longer importable
+        c = p.pipenv('run python -c "import pytest"')
+        assert c.returncode != 0
+
+        # Verify six is still importable
+        c = p.pipenv('run python -c "import six"')
+        assert c.returncode == 0
+
+
+@pytest.mark.install
+@pytest.mark.uninstall
+def test_uninstall_dev_flag_with_categories(pipenv_instance_private_pypi):
+    """Ensure that running `pipenv uninstall --dev` works the same as `--categories dev-packages`"""
+    with pipenv_instance_private_pypi() as p:
+        with open(p.pipfile_path, "w") as f:
+            contents = """
+[packages]
+six = "*"
+
+[dev-packages]
+pytest = "*"
+            """.strip()
+            f.write(contents)
+
+        # Install both packages
+        c = p.pipenv("install --dev")
+        assert c.returncode == 0
+
+        # Create a second project to test with categories
+        with pipenv_instance_private_pypi() as p2:
+            with open(p2.pipfile_path, "w") as f:
+                contents = """
+[packages]
+six = "*"
+
+[dev-packages]
+pytest = "*"
+                """.strip()
+                f.write(contents)
+
+            # Install both packages
+            c = p2.pipenv("install --dev")
+            assert c.returncode == 0
+
+            # Uninstall pytest with --categories
+            c = p2.pipenv("uninstall pytest --categories dev-packages")
+            assert c.returncode == 0
+
+            # Verify pytest was removed from dev-packages
+            assert "six" in p2.pipfile["packages"]
+            assert "pytest" not in p2.pipfile["dev-packages"]
+            assert "six" in p2.lockfile["default"]
+            assert "pytest" not in p2.lockfile["develop"]
+
+            # Compare with first project
+            c = p.pipenv("uninstall pytest --dev")
+            assert c.returncode == 0
+
+            # Verify both approaches have the same result
+            assert p.pipfile["packages"] == p2.pipfile["packages"]
+            assert p.pipfile["dev-packages"] == p2.pipfile["dev-packages"]
+            assert p.lockfile["default"] == p2.lockfile["default"]
+            assert p.lockfile["develop"] == p2.lockfile["develop"]