Pants internally uses dedicated Sources and Dependencies fields

src/python/pants/backend/cc/target_types.py

@@ -20,6 +20,10 @@
 CC_FILE_EXTENSIONS = (".c", ".h", ".cc", ".cpp", ".hpp")
 
 
+class CCDependenciesField(Dependencies):
+    pass
+
+
 class CCSourceField(SingleSourceField):
     expected_file_extensions = CC_FILE_EXTENSIONS
 
@@ -51,7 +55,7 @@ class CCSourceTarget(Target):
     alias = "cc_source"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        Dependencies,
+        CCDependenciesField,
         CCSourceField,
     )
     help = "A single C/C++ source file or header file."

src/python/pants/backend/codegen/avro/target_types.py

@@ -20,8 +20,6 @@
 from pants.util.strutil import softwrap
 
 
-# NB: We subclass Dependencies so that specific backends can add dependency injection rules to
-# `avro_source` targets.
 class AvroDependenciesField(Dependencies):
     pass
 

src/python/pants/backend/codegen/protobuf/target_types.py

@@ -25,8 +25,6 @@
 from pants.util.strutil import softwrap
 
 
-# NB: We subclass Dependencies so that specific backends can add dependency injection rules to
-# `protobuf_source` targets.
 class ProtobufDependenciesField(Dependencies):
     pass
 

src/python/pants/backend/codegen/thrift/target_types.py

@@ -24,8 +24,6 @@
 from pants.util.strutil import softwrap
 
 
-# NB: We subclass Dependencies so that specific backends can add dependency injection rules to
-# `thrift_source` targets.
 class ThriftDependenciesField(Dependencies):
     pass
 

src/python/pants/backend/java/target_types.py

@@ -8,7 +8,6 @@
 from pants.engine.rules import collect_rules
 from pants.engine.target import (
     COMMON_TARGET_FIELDS,
-    Dependencies,
     FieldSet,
     MultipleSourcesField,
     SingleSourceField,
@@ -18,6 +17,7 @@
 )
 from pants.jvm.target_types import (
     JunitTestSourceField,
+    JvmDependenciesField,
     JvmJdkField,
     JvmProvidesTypesField,
     JvmResolveField,
@@ -60,7 +60,7 @@ class JunitTestTarget(Target):
     core_fields = (
         *COMMON_TARGET_FIELDS,
         JavaJunitTestSourceField,
-        Dependencies,
+        JvmDependenciesField,
         JvmResolveField,
         JvmProvidesTypesField,
         JvmJdkField,
@@ -84,7 +84,7 @@ class JunitTestsGeneratorTarget(TargetFilesGenerator):
     generated_target_cls = JunitTestTarget
     copied_fields = COMMON_TARGET_FIELDS
     moved_fields = (
-        Dependencies,
+        JvmDependenciesField,
         JvmJdkField,
         JvmProvidesTypesField,
         JvmResolveField,
@@ -101,7 +101,7 @@ class JavaSourceTarget(Target):
     alias = "java_source"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        Dependencies,
+        JvmDependenciesField,
         JavaSourceField,
         JvmResolveField,
         JvmProvidesTypesField,
@@ -126,7 +126,7 @@ class JavaSourcesGeneratorTarget(TargetFilesGenerator):
     generated_target_cls = JavaSourceTarget
     copied_fields = COMMON_TARGET_FIELDS
     moved_fields = (
-        Dependencies,
+        JvmDependenciesField,
         JvmResolveField,
         JvmJdkField,
         JvmProvidesTypesField,

src/python/pants/backend/javascript/target_types.py

@@ -15,6 +15,10 @@
 JS_FILE_EXTENSIONS = (".js",)
 
 
+class JSDependenciesField(Dependencies):
+    pass
+
+
 class JSSourceField(SingleSourceField):
     expected_file_extensions = JS_FILE_EXTENSIONS
 
@@ -32,7 +36,7 @@ class JSSourceTarget(Target):
     alias = "javascript_source"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        Dependencies,
+        JSDependenciesField,
         JSSourceField,
     )
     help = "A single Javascript source file."
@@ -50,5 +54,5 @@ class JSSourcesGeneratorTarget(TargetFilesGenerator):
     )
     generated_target_cls = JSSourceTarget
     copied_fields = COMMON_TARGET_FIELDS
-    moved_fields = (Dependencies,)
+    moved_fields = (JSDependenciesField,)
     help = "Generate a `javascript_source` target for each file in the `sources` field."

src/python/pants/backend/project_info/dependees_test.py

@@ -15,9 +15,13 @@ class SpecialDeps(SpecialCasedDependencies):
     alias = "special_deps"
 
 
+class MockDepsField(Dependencies):
+    pass
+
+
 class MockTarget(Target):
     alias = "tgt"
-    core_fields = (Dependencies, SpecialDeps)
+    core_fields = (MockDepsField, SpecialDeps)
 
 
 @pytest.fixture

src/python/pants/backend/project_info/filedeps_test.py

@@ -15,9 +15,13 @@ class MockSources(MultipleSourcesField):
     default = ("*.ext",)
 
 
+class MockDepsField(Dependencies):
+    pass
+
+
 class MockTarget(Target):
     alias = "tgt"
-    core_fields = (MockSources, Dependencies)
+    core_fields = (MockSources, MockDepsField)
 
 
 class MockSingleSourceField(SingleSourceField):
@@ -26,7 +30,7 @@ class MockSingleSourceField(SingleSourceField):
 
 class MockSingleSourceTarget(Target):
     alias = "single_source"
-    core_fields = (MockSingleSourceField, Dependencies)
+    core_fields = (MockSingleSourceField, MockDepsField)
 
 
 @pytest.fixture

src/python/pants/backend/project_info/filter_targets_test.py

@@ -34,15 +34,23 @@ class MockTarget(Target):
     deprecated_alias_removal_version = "99.9.0.dev0"
 
 
+class MockSingleSourceField(SingleSourceField):
+    pass
+
+
 class MockGeneratedFileTarget(Target):
     alias = "file_generated"
-    core_fields = (SingleSourceField, Tags)
+    core_fields = (MockSingleSourceField, Tags)
+
+
+class MockMultipleSourcesField(MultipleSourcesField):
+    pass
 
 
 class MockFileTargetGenerator(TargetFilesGenerator):
     alias = "file_generator"
     generated_target_cls = MockGeneratedFileTarget
-    core_fields = (MultipleSourcesField, Tags)
+    core_fields = (MockMultipleSourcesField, Tags)
     copied_fields = (Tags,)
     moved_fields = ()
 

src/python/pants/backend/project_info/paths_test.py

@@ -19,11 +19,15 @@ class MockSourceField(OptionalSingleSourceField):
     expected_file_extensions: ClassVar[tuple[str, ...]] = (".txt",)
 
 
+class MockDepsField(Dependencies):
+    pass
+
+
 class MockTarget(Target):
     alias = "tgt"
     core_fields = (
         MockSourceField,
-        Dependencies,
+        MockDepsField,
     )
 
 

src/python/pants/backend/python/target_types.py

@@ -85,6 +85,10 @@ class PythonSourceField(SingleSourceField):
     expected_file_extensions: ClassVar[tuple[str, ...]] = ("", ".py", ".pyi")
 
 
+class PythonDependenciesField(Dependencies):
+    pass
+
+
 class PythonGeneratingSourcesBase(MultipleSourcesField):
     expected_file_extensions: ClassVar[tuple[str, ...]] = ("", ".py", ".pyi")
 
@@ -930,7 +934,7 @@ class PythonSourceTarget(Target):
     core_fields = (
         *COMMON_TARGET_FIELDS,
         InterpreterConstraintsField,
-        Dependencies,
+        PythonDependenciesField,
         PythonResolveField,
         PythonRunGoalUseSandboxField,
         PythonSourceField,
@@ -982,7 +986,7 @@ class PythonTestUtilsGeneratorTarget(TargetFilesGenerator):
     moved_fields = (
         PythonResolveField,
         PythonRunGoalUseSandboxField,
-        Dependencies,
+        PythonDependenciesField,
         InterpreterConstraintsField,
     )
     settings_request_cls = PythonFilesGeneratorSettingsRequest
@@ -1013,7 +1017,7 @@ class PythonSourcesGeneratorTarget(TargetFilesGenerator):
     moved_fields = (
         PythonResolveField,
         PythonRunGoalUseSandboxField,
-        Dependencies,
+        PythonDependenciesField,
         InterpreterConstraintsField,
     )
     settings_request_cls = PythonFilesGeneratorSettingsRequest
@@ -1070,6 +1074,10 @@ def compute_value(
         return tuple(result)
 
 
+class PythonRequirementDependenciesField(Dependencies):
+    pass
+
+
 class PythonRequirementsField(_PipRequirementSequenceField):
     alias = "requirements"
     required = True
@@ -1161,8 +1169,8 @@ class PythonRequirementTarget(Target):
     alias = "python_requirement"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        Dependencies,
         PythonRequirementsField,
+        PythonRequirementDependenciesField,
         PythonRequirementModulesField,
         PythonRequirementTypeStubModulesField,
         PythonRequirementResolveField,

src/python/pants/backend/python/util_rules/python_sources_test.py

@@ -34,9 +34,13 @@ class PythonTarget(Target):
     core_fields = (PythonSourceField,)
 
 
+class NonPythonSourceField(SingleSourceField):
+    pass
+
+
 class NonPythonTarget(Target):
     alias = "non_python_target"
-    core_fields = (SingleSourceField,)
+    core_fields = (NonPythonSourceField,)
 
 
 @pytest.fixture

src/python/pants/backend/scala/test/scalatest.py

@@ -27,20 +27,15 @@
     ProcessCacheScope,
 )
 from pants.engine.rules import Get, MultiGet, collect_rules, rule
-from pants.engine.target import (
-    Dependencies,
-    SourcesField,
-    TransitiveTargets,
-    TransitiveTargetsRequest,
-)
+from pants.engine.target import SourcesField, TransitiveTargets, TransitiveTargetsRequest
 from pants.engine.unions import UnionRule
 from pants.jvm.classpath import Classpath
 from pants.jvm.goals import lockfile
 from pants.jvm.jdk_rules import JdkEnvironment, JdkRequest, JvmProcess
 from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
 from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool
 from pants.jvm.subsystems import JvmSubsystem
-from pants.jvm.target_types import JvmJdkField
+from pants.jvm.target_types import JvmDependenciesField, JvmJdkField
 from pants.util.logging import LogLevel
 
 logger = logging.getLogger(__name__)
@@ -55,7 +50,7 @@ class ScalatestTestFieldSet(TestFieldSet):
 
     sources: ScalatestTestSourceField
     jdk_version: JvmJdkField
-    dependencies: Dependencies
+    dependencies: JvmDependenciesField
 
 
 class ScalatestToolLockfileSentinel(GenerateToolLockfileSentinel):

src/python/pants/backend/shell/lint/shellcheck/rules.py

@@ -5,7 +5,7 @@
 
 from pants.backend.shell.lint.shellcheck.skip_field import SkipShellcheckField
 from pants.backend.shell.lint.shellcheck.subsystem import Shellcheck
-from pants.backend.shell.target_types import ShellSourceField
+from pants.backend.shell.target_types import ShellDependenciesField, ShellSourceField
 from pants.core.goals.lint import LintResult, LintResults, LintTargetsRequest
 from pants.core.util_rules.config_files import ConfigFiles, ConfigFilesRequest
 from pants.core.util_rules.external_tool import DownloadedExternalTool, ExternalToolRequest
@@ -14,14 +14,7 @@
 from pants.engine.platform import Platform
 from pants.engine.process import FallibleProcessResult, Process
 from pants.engine.rules import Get, MultiGet, collect_rules, rule
-from pants.engine.target import (
-    Dependencies,
-    DependenciesRequest,
-    FieldSet,
-    SourcesField,
-    Target,
-    Targets,
-)
+from pants.engine.target import DependenciesRequest, FieldSet, SourcesField, Target, Targets
 from pants.engine.unions import UnionRule
 from pants.util.logging import LogLevel
 from pants.util.strutil import pluralize
@@ -32,7 +25,7 @@ class ShellcheckFieldSet(FieldSet):
     required_fields = (ShellSourceField,)
 
     sources: ShellSourceField
-    dependencies: Dependencies
+    dependencies: ShellDependenciesField
 
     @classmethod
     def opt_out(cls, tgt: Target) -> bool: