Merge pull request #156 from getsentry/multiple-add-pkg

add_pkg: support multiple packages and skipping resolution

Author: asottile-sentry

add_pkg.py

@@ -13,28 +13,41 @@
 
 def main(argv: Sequence[str] | None = None) -> int:
     parser = argparse.ArgumentParser()
-    parser.add_argument("dep")
+    parser.add_argument("deps", nargs="+")
     parser.add_argument("--packages-ini", default="packages.ini")
+    parser.add_argument(
+        "--skip-resolve",
+        action="store_true",
+        help="skip resolving dependencies, all deps must be specified as k==v",
+    )
     args = parser.parse_args(argv)
 
-    print(f"resolving {args.dep}...")
-    with tempfile.TemporaryDirectory() as tmpdir:
-        subprocess.check_call(
-            (
-                sys.executable,
-                "-mpip",
-                "wheel",
-                "--quiet",
-                "--no-cache-dir",
-                f"--wheel-dir={tmpdir}",
-                args.dep,
+    if args.skip_resolve:
+        deps = []
+        for dep in args.deps:
+            name, _, version = dep.partition("==")
+            if not version:
+                raise SystemExit(f"dep must be name==version: {dep!r}")
+            deps.append((name, version))
+    else:
+        print(f"resolving {' '.join(args.deps)}...")
+        with tempfile.TemporaryDirectory() as tmpdir:
+            subprocess.check_call(
+                (
+                    sys.executable,
+                    "-mpip",
+                    "wheel",
+                    "--quiet",
+                    "--no-cache-dir",
+                    f"--wheel-dir={tmpdir}",
+                    *args.deps,
+                )
             )
-        )
 
-        deps = []
-        for filename in sorted(os.listdir(tmpdir)):
-            name, version, _, _ = parse_wheel_filename(filename)
-            deps.append((name, str(version)))
+            deps = []
+            for filename in sorted(os.listdir(tmpdir)):
+                name, version, _, _ = parse_wheel_filename(filename)
+                deps.append((name, str(version)))
 
     cfg = configparser.ConfigParser()
     assert cfg.read(args.packages_ini)

tests/add_pkg_test.py

@@ -34,6 +34,21 @@ def test_new_pkg(pretend_pip, tmp_path, capsys):
     assert out == "resolving a...\na==1: adding...\n"
 
 
+def test_new_pkg_multiple_packages(pretend_pip, tmp_path, capsys):
+    pretend_pip.joinpath("a-1-py3-none-any.whl").touch()
+    pretend_pip.joinpath("c-2-py3-none-any.whl").touch()
+
+    packages_ini = tmp_path.joinpath("packages.ini")
+    packages_ini.write_text("[b==1]\n")
+
+    assert add_pkg.main(("a", "c", f"--packages-ini={packages_ini}")) == 0
+
+    assert packages_ini.read_text() == "[a==1]\n\n[b==1]\n\n[c==2]\n"
+
+    out, _ = capsys.readouterr()
+    assert out == "resolving a c...\na==1: adding...\nc==2: adding...\n"
+
+
 def test_pkg_already_present(pretend_pip, tmp_path, capsys):
     pretend_pip.joinpath("a-1-py3-none-any.whl").touch()
 
@@ -65,3 +80,22 @@ def test_pkg_copied_from_previous_version(pretend_pip, tmp_path, capsys):
 
     out, _ = capsys.readouterr()
     assert out == "resolving a...\na==2: adding...\n"
+
+
+def test_skip_resolve(tmp_path, capsys):
+    packages_ini = tmp_path.joinpath("packages.ini")
+    packages_ini.write_text("[a==1]\n")
+
+    # an attempt to use `pip` should raise!
+    with mock.patch.object(subprocess, "check_call", side_effect=AssertionError):
+        ret = add_pkg.main(("a==2", "--skip-resolve", f"--packages-ini={packages_ini}"))
+        assert ret == 0
+
+    assert packages_ini.read_text() == "[a==1]\n[a==2]\n"
+
+
+def test_error_with_skip_resolve_an_not_pinned(capsys):
+    with pytest.raises(SystemExit) as excinfo:
+        add_pkg.main(("wat", "--skip-resolve"))
+    (msg,) = excinfo.value.args
+    assert msg == "dep must be name==version: 'wat'"