Update integration test

pantsbuild · May 12, 2024 · fb8e41d · fb8e41d
1 parent 4124590
commit fb8e41d
Show file tree

Hide file tree

Showing 8 changed files with 1,438 additions and 938 deletions.
diff --git a/src/python/pants/backend/javascript/install_node_package.py b/src/python/pants/backend/javascript/install_node_package.py
@@ -27,13 +27,7 @@
 from pants.engine.internals.selectors import Get
 from pants.engine.process import ProcessResult
 from pants.engine.rules import Rule, collect_rules, rule
-from pants.engine.target import (
-    SourcesField,
-    Target,
-    TransitiveTargets,
-    TransitiveTargetsRequest,
-    targets_with_sources_types,
-)
+from pants.engine.target import SourcesField, Target, TransitiveTargets, TransitiveTargetsRequest
 from pants.engine.unions import UnionMembership, UnionRule
 
 
@@ -86,11 +80,6 @@ async def install_node_packages_for_address(
     target = project_env.ensure_target()
     transitive_tgts = await Get(TransitiveTargets, TransitiveTargetsRequest([target.address]))
 
-    pkg_tgts = targets_with_sources_types(
-        [PackageJsonSourceField], transitive_tgts.dependencies, union_membership
-    )
-    assert target not in pkg_tgts
-
     source_files = await _get_relevant_source_files(
         (tgt[SourcesField] for tgt in transitive_tgts.closure if tgt.has_field(SourcesField)),
         with_js=False,

diff --git a/src/python/pants/backend/javascript/nodejs_project.py b/src/python/pants/backend/javascript/nodejs_project.py
@@ -225,11 +225,9 @@ async def find_node_js_projects(
     # Note: If pnpm_workspace.yaml is present for an npm-managed project, it will override the package.json["workspaces"] setting, which is not intuitive
     # Probably pnpm_workspace.yaml should only be used for pnpm projects.
     project_paths = (
-        (
-            ProjectPaths(pkg.root_dir, ["", *pkg.workspaces])
-            if pkg not in pnpm_workspaces
-            else ProjectPaths(pkg.root_dir, ["", *pnpm_workspaces[pkg].packages])
-        )
+        ProjectPaths(pkg.root_dir, ["", *pkg.workspaces])
+        if pkg not in pnpm_workspaces
+        else ProjectPaths(pkg.root_dir, ["", *pnpm_workspaces[pkg].packages])
         for pkg in package_workspaces
     )
 

diff --git a/src/python/pants/backend/javascript/nodejs_project_test.py b/src/python/pants/backend/javascript/nodejs_project_test.py
@@ -74,10 +74,7 @@ def test_parses_projects(rule_runner: RuleRunner) -> None:
 @pytest.mark.parametrize(
     ("package_manager", "expected_immutable_install_args"),
     [
-        (
-            None,
-            ("clean-install",),
-        ),
+        (None, ("clean-install",)),
         ("npm@10.2.4", ("clean-install",)),
         ("pnpm@7.5.0", ("install", "--frozen-lockfile")),
         ("yarn@1.22.19", ("install", "--frozen-lockfile")),