Skip to content

Commit 798c712

Browse files
committed
pants plugins updates
1 parent aec41b4 commit 798c712

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

pants-plugins/stevedore_extensions/python_dependency_injection.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
from pants.engine.addresses import Address
2626
from pants.engine.rules import collect_rules, Get, rule, UnionRule
2727
from pants.engine.target import (
28-
InjectDependenciesRequest,
29-
InjectedDependencies,
28+
InferDependenciesRequest,
29+
InferredDependencies,
3030
Targets,
3131
WrappedTarget,
3232
WrappedTargetRequest,
@@ -66,18 +66,18 @@ async def map_stevedore_extensions(
6666
)
6767

6868

69-
class InjectStevedoreNamespaceDependencies(InjectDependenciesRequest):
69+
class InferStevedoreNamespaceDependencies(InferDependenciesRequest):
7070
inject_for = PythonTestsDependenciesField
7171

7272

7373
@rule(
74-
desc="Inject stevedore_extension target dependencies for python_tests based on namespace list.",
74+
desc="Infer stevedore_extension target dependencies for python_tests based on namespace list.",
7575
level=LogLevel.DEBUG,
7676
)
7777
async def inject_stevedore_namespace_dependencies(
78-
request: InjectStevedoreNamespaceDependencies,
78+
request: InferStevedoreNamespaceDependencies,
7979
stevedore_extensions: StevedoreExtensions,
80-
) -> InjectedDependencies:
80+
) -> InferredDependencies:
8181
original_tgt: WrappedTarget
8282
original_tgt = await Get(
8383
WrappedTarget,
@@ -87,7 +87,7 @@ async def inject_stevedore_namespace_dependencies(
8787
),
8888
)
8989
if original_tgt.target.get(StevedoreNamespacesField).value is None:
90-
return InjectedDependencies()
90+
return InferredDependencies()
9191

9292
namespaces: StevedoreNamespacesField = original_tgt.target[StevedoreNamespacesField]
9393

@@ -97,13 +97,13 @@ async def inject_stevedore_namespace_dependencies(
9797
addresses.extend(extension.address for extension in extensions)
9898

9999
result: OrderedSet[Address] = OrderedSet(addresses)
100-
return InjectedDependencies(sorted(result))
100+
return InferredDependencies(sorted(result))
101101

102102

103103
def rules():
104104
return [
105105
*collect_rules(),
106106
PythonTestsGeneratorTarget.register_plugin_field(StevedoreNamespacesField),
107107
PythonTestTarget.register_plugin_field(StevedoreNamespacesField),
108-
UnionRule(InjectDependenciesRequest, InjectStevedoreNamespaceDependencies),
108+
UnionRule(InferDependenciesRequest, InferStevedoreNamespaceDependencies),
109109
]

pants-plugins/stevedore_extensions/target_types_rules.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
Dependencies,
3030
DependenciesRequest,
3131
ExplicitlyProvidedDependencies,
32-
InjectDependenciesRequest,
33-
InjectedDependencies,
32+
InferDependenciesRequest,
33+
InferredDependencies,
3434
InvalidFieldException,
3535
WrappedTarget,
3636
WrappedTargetRequest,
@@ -143,7 +143,7 @@ async def resolve_stevedore_entry_points(
143143
return ResolvedStevedoreEntryPoints(StevedoreEntryPoints(resolved))
144144

145145

146-
class InjectStevedoreExtensionDependencies(InjectDependenciesRequest):
146+
class InferStevedoreExtensionDependencies(InferDependenciesRequest):
147147
inject_for = StevedoreDependenciesField
148148

149149

@@ -152,9 +152,9 @@ class InjectStevedoreExtensionDependencies(InjectDependenciesRequest):
152152
level=LogLevel.DEBUG,
153153
)
154154
async def inject_stevedore_entry_points_dependencies(
155-
request: InjectStevedoreExtensionDependencies,
155+
request: InferStevedoreExtensionDependencies,
156156
python_setup: PythonSetup,
157-
) -> InjectedDependencies:
157+
) -> InferredDependencies:
158158
original_tgt: WrappedTarget = await Get(
159159
WrappedTarget,
160160
WrappedTargetRequest(
@@ -176,7 +176,7 @@ async def inject_stevedore_entry_points_dependencies(
176176
),
177177
)
178178
if entry_points.val is None:
179-
return InjectedDependencies()
179+
return InferredDependencies()
180180
address = original_tgt.target.address
181181
owners_per_entry_point = await MultiGet(
182182
Get(
@@ -210,12 +210,12 @@ async def inject_stevedore_entry_points_dependencies(
210210
(maybe_disambiguated,) if maybe_disambiguated else ()
211211
)
212212
resolved_owners.extend(unambiguous_owners)
213-
return InjectedDependencies(resolved_owners)
213+
return InferredDependencies(resolved_owners)
214214

215215

216216
def rules():
217217
return [
218218
*collect_rules(),
219219
*import_rules(),
220-
UnionRule(InjectDependenciesRequest, InjectStevedoreExtensionDependencies),
220+
UnionRule(InferDependenciesRequest, InferStevedoreExtensionDependencies),
221221
]

0 commit comments

Comments
 (0)