Replace coursier-resolve goal with generate-lockfiles (pantsbuild…

…#14211) [ci skip-rust]
asherf · Jan 20, 2022 · 1080d7b · 1080d7b
1 parent e771911
commit 1080d7b
Show file tree

Hide file tree

Showing 11 changed files with 206 additions and 393 deletions.
diff --git a/src/python/pants/backend/experimental/java/register.py b/src/python/pants/backend/experimental/java/register.py
@@ -17,7 +17,7 @@
 from pants.jvm import classpath, jdk_rules, resources
 from pants.jvm import util_rules as jvm_util_rules
 from pants.jvm.dependency_inference import symbol_mapper
-from pants.jvm.goals import coursier
+from pants.jvm.goals import lockfile
 from pants.jvm.resolve import coursier_fetch, jvm_tool
 from pants.jvm.target_types import JvmArtifactTarget
 from pants.jvm.test import junit
@@ -41,7 +41,7 @@ def rules():
         *classpath.rules(),
         *junit.rules(),
         *deploy_jar.rules(),
-        *coursier.rules(),
+        *lockfile.rules(),
         *coursier_fetch.rules(),
         *java_parser.rules(),
         *java_parser_launcher.rules(),

diff --git a/src/python/pants/backend/experimental/scala/register.py b/src/python/pants/backend/experimental/scala/register.py
@@ -18,7 +18,7 @@
 from pants.backend.scala.test import scalatest
 from pants.jvm import classpath, jdk_rules, resources
 from pants.jvm import util_rules as jvm_util_rules
-from pants.jvm.goals import coursier
+from pants.jvm.goals import lockfile
 from pants.jvm.resolve import coursier_fetch, coursier_setup, jvm_tool
 from pants.jvm.target_types import JvmArtifactTarget
 from pants.jvm.test import junit
@@ -48,7 +48,7 @@ def rules():
         *classpath.rules(),
         *junit.rules(),
         *deploy_jar.rules(),
-        *coursier.rules(),
+        *lockfile.rules(),
         *coursier_fetch.rules(),
         *coursier_setup.rules(),
         *jvm_util_rules.rules(),

diff --git a/src/python/pants/backend/java/compile/javac_test.py b/src/python/pants/backend/java/compile/javac_test.py
@@ -24,7 +24,7 @@
 from pants.engine.target import CoarsenedTargets, Targets
 from pants.jvm import jdk_rules, testutil
 from pants.jvm.compile import ClasspathEntry, CompileResult, FallibleClasspathEntry
-from pants.jvm.goals.coursier import rules as coursier_rules
+from pants.jvm.goals import lockfile
 from pants.jvm.resolve.common import ArtifactRequirement, Coordinate, Coordinates
 from pants.jvm.resolve.coursier_fetch import CoursierLockfileEntry
 from pants.jvm.resolve.coursier_fetch import rules as coursier_fetch_rules
@@ -55,7 +55,7 @@ def rule_runner() -> RuleRunner:
             *javac_check_rules(),
             *util_rules(),
             *target_types_rules(),
-            *coursier_rules(),
+            *lockfile.rules(),
             *jdk_rules.rules(),
             *java_dep_inf_rules(),
             *source_files.rules(),

diff --git a/src/python/pants/core/goals/generate_lockfiles.py b/src/python/pants/core/goals/generate_lockfiles.py
@@ -221,10 +221,6 @@ def determine_resolves_to_generate(
         sentinel.options_scope: sentinel for sentinel in all_tool_sentinels
     }
 
-    # TODO: check for ambiguity: between tools and user resolves, and across distinct
-    #  `KnownUserResolveNames`s. Update AmbiguousResolveNamesError to say where the resolve
-    #  name is defined, whereas right now we hardcode it to be the `[python]` option.
-
     if not requested_resolve_names:
         return [
             known_resolve_names.requested_resolve_names_cls(known_resolve_names.names)
@@ -289,8 +285,7 @@ def filter_tool_lockfile_requests(
 class GenerateLockfilesSubsystem(GoalSubsystem):
     name = "generate-lockfiles"
     help = "Generate lockfiles for Python third-party dependencies."
-    # TODO: Add back `KnownUserResolveNames` once JVM implements it.
-    required_union_implementations = (ToolLockfileSentinel,)
+    required_union_implementations = (ToolLockfileSentinel, KnownUserResolveNamesRequest)
 
     @classmethod
     def register_options(cls, register) -> None:

diff --git a/src/python/pants/jvm/compile_test.py b/src/python/pants/jvm/compile_test.py
@@ -45,7 +45,7 @@
     ClasspathSourceAmbiguity,
     ClasspathSourceMissing,
 )
-from pants.jvm.goals.coursier import rules as coursier_rules
+from pants.jvm.goals import lockfile
 from pants.jvm.resolve.coursier_fetch import CoursierFetchRequest
 from pants.jvm.resolve.coursier_fetch import rules as coursier_fetch_rules
 from pants.jvm.resolve.coursier_setup import rules as coursier_setup_rules
@@ -66,7 +66,7 @@ def rule_runner() -> RuleRunner:
         rules=[
             *config_files.rules(),
             *coursier_fetch_rules(),
-            *coursier_rules(),
+            *lockfile.rules(),
             *classpath.rules(),
             *coursier_setup_rules(),
             *external_tool_rules(),

diff --git a/src/python/pants/jvm/goals/coursier.py b/src/python/pants/jvm/goals/coursier.py