update to pants 2.13.0a1

Author: cognifloyd

pants-plugins/stevedore_extensions/python_dependency_injection.py

@@ -21,21 +21,22 @@
     PythonTestsGeneratorTarget,
     PythonTestsDependenciesField,
 )
-from pants.base.specs import AddressSpecs, DescendantAddresses, SiblingAddresses
+from pants.base.specs import DirGlobSpec, RawSpecs
 from pants.engine.addresses import Address
 from pants.engine.rules import collect_rules, Get, rule, UnionRule
 from pants.engine.target import (
     InjectDependenciesRequest,
     InjectedDependencies,
     Targets,
     WrappedTarget,
+    WrappedTargetRequest,
 )
 from pants.util.frozendict import FrozenDict
 from pants.util.logging import LogLevel
 from pants.util.ordered_set import OrderedSet
 
 from stevedore_extensions.target_types import (
-    StevedoreDependenciesField,
+    AllStevedoreExtensionTargets,
     StevedoreEntryPointsField,
     StevedoreExtension,
     StevedoreNamespaceField,
@@ -54,11 +55,9 @@ class StevedoreExtensions:
     desc="Creating map of stevedore_extension namespaces to StevedoreExtension targets",
     level=LogLevel.DEBUG,
 )
-async def map_stevedore_extensions() -> StevedoreExtensions:
-    all_expanded_targets = await Get(Targets, AddressSpecs([DescendantAddresses("")]))
-    stevedore_extensions = tuple(
-        tgt for tgt in all_expanded_targets if tgt.has_field(StevedoreDependenciesField)
-    )
+async def map_stevedore_extensions(
+    stevedore_extensions: AllStevedoreExtensionTargets,
+) -> StevedoreExtensions:
     mapping: Mapping[str, List[StevedoreExtension]] = defaultdict(list)
     for extension in stevedore_extensions:
         mapping[extension[StevedoreNamespaceField].value].append(extension)
@@ -80,7 +79,13 @@ async def inject_stevedore_namespace_dependencies(
     stevedore_extensions: StevedoreExtensions,
 ) -> InjectedDependencies:
     original_tgt: WrappedTarget
-    original_tgt = await Get(WrappedTarget, Address, request.dependencies_field.address)
+    original_tgt = await Get(
+        WrappedTarget,
+        WrappedTargetRequest(
+            request.dependencies_field.address,
+            description_of_origin="inject_stevedore_namespace_dependencies",
+        ),
+    )
     if original_tgt.target.get(StevedoreNamespacesField).value is None:
         return InjectedDependencies()
 

pants-plugins/stevedore_extensions/target_types.py

@@ -29,6 +29,7 @@
     StringField,
     StringSequenceField,
     Target,
+    Targets,
 )
 from pants.backend.python.target_types import EntryPoint, PythonResolveField
 from pants.source.filespec import Filespec
@@ -141,3 +142,7 @@ class StevedoreNamespacesField(StringSequenceField):
         "The stevedore namespace format (my.stevedore.extension) is similar "
         "to a python namespace."
     )
+
+
+class AllStevedoreExtensionTargets(Targets):
+    pass

pants-plugins/stevedore_extensions/target_types_rules.py

@@ -22,22 +22,24 @@
 from pants.backend.python.dependency_inference.rules import import_rules
 from pants.backend.python.subsystems.setup import PythonSetup
 from pants.backend.python.target_types import PythonResolveField
-from pants.engine.addresses import Address
 from pants.engine.fs import GlobMatchErrorBehavior, PathGlobs, Paths
 from pants.engine.rules import Get, collect_rules, MultiGet, rule, UnionRule
 from pants.engine.target import (
+    AllTargets,
     Dependencies,
     DependenciesRequest,
     ExplicitlyProvidedDependencies,
     InjectDependenciesRequest,
     InjectedDependencies,
     InvalidFieldException,
     WrappedTarget,
+    WrappedTargetRequest,
 )
 from pants.source.source_root import SourceRoot, SourceRootRequest
 from pants.util.logging import LogLevel
 
 from stevedore_extensions.target_types import (
+    AllStevedoreExtensionTargets,
     ResolvedStevedoreEntryPoints,
     ResolveStevedoreEntryPointsRequest,
     StevedoreDependenciesField,
@@ -46,6 +48,15 @@
 )
 
 
+@rule(desc="Find all StevedoreExtension targets in project", level=LogLevel.DEBUG)
+def find_all_stevedore_extension_targets(
+    targets: AllTargets,
+) -> AllStevedoreExtensionTargets:
+    return AllStevedoreExtensionTargets(
+        tgt for tgt in targets if tgt.has_field(StevedoreDependenciesField)
+    )
+
+
 @rule(
     desc="Determining the entry points for a `stevedore_extension` target",
     level=LogLevel.DEBUG,
@@ -145,7 +156,11 @@ async def inject_stevedore_entry_points_dependencies(
     python_setup: PythonSetup,
 ) -> InjectedDependencies:
     original_tgt: WrappedTarget = await Get(
-        WrappedTarget, Address, request.dependencies_field.address
+        WrappedTarget,
+        WrappedTargetRequest(
+            request.dependencies_field.address,
+            description_of_origin="inject_stevedore_entry_points_dependencies",
+        ),
     )
     entry_points: ResolvedStevedoreEntryPoints
     explicitly_provided_deps, entry_points = await MultiGet(