pipx inject: Imply --include-apps if --include-deps is passed (#…

…984) Co-authored-by: Bernát Gábor <[email protected]>
pypa · Nov 30, 2023 · 1508f18 · 1508f18
1 parent d4798ea
commit 1508f18
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## dev
 
+- Imply `--include-apps` when running `pipx inject --include-deps`
 - Add `--with-suffix` for `pipx inject` command
 - `pipx install`: emit a warning when `--force` and `--python` were passed at the same time
 - Drop support for Python 3.7

diff --git a/src/pipx/commands/inject.py b/src/pipx/commands/inject.py
@@ -98,9 +98,7 @@ def inject(
 ) -> ExitCode:
     """Returns pipx exit code."""
     if not include_apps and include_dependencies:
-        raise PipxError(
-            "Cannot pass --include-deps if --include-apps is not passed as well"
-        )
+        include_apps = True
     all_success = True
     for dep in package_specs:
         all_success &= inject_dep(

diff --git a/src/pipx/main.py b/src/pipx/main.py
@@ -384,7 +384,11 @@ def _add_inject(subparsers, venv_completer: VenvCompleter) -> None:
         action="store_true",
         help="Add apps from the injected packages onto your PATH",
     )
-    add_include_dependencies(p)
+    p.add_argument(
+        "--include-deps",
+        help="Include apps of dependent packages. Implies --include-apps",
+        action="store_true",
+    )
     add_pip_venv_args(p)
     p.add_argument(
         "--force",

diff --git a/tests/test_inject.py b/tests/test_inject.py
@@ -41,27 +41,15 @@ def test_inject_include_apps(pipx_temp_env, capsys, with_suffix):
         install_args = [f"--suffix={suffix}"]
 
     assert not run_pipx_cli(["install", "pycowsay", *install_args])
-    assert run_pipx_cli(
+    assert not run_pipx_cli(
         ["inject", f"pycowsay{suffix}", PKG["black"]["spec"], "--include-deps"]
     )
 
     if suffix:
         assert run_pipx_cli(
-            [
-                "inject",
-                "pycowsay",
-                PKG["black"]["spec"],
-                "--include-deps",
-                "--include-apps",
-            ]
+            ["inject", "pycowsay", PKG["black"]["spec"], "--include-deps"]
         )
 
     assert not run_pipx_cli(
-        [
-            "inject",
-            f"pycowsay{suffix}",
-            PKG["black"]["spec"],
-            "--include-deps",
-            "--include-apps",
-        ]
+        ["inject", f"pycowsay{suffix}", PKG["black"]["spec"], "--include-deps"]
     )