Skip to content

Commit

Permalink
Update the Pants codebase to use register_rules.
Browse files Browse the repository at this point in the history
[ci skip-rust-tests]
  • Loading branch information
jsirois committed Jul 27, 2020
1 parent 6acb707 commit 0f26d8b
Show file tree
Hide file tree
Showing 60 changed files with 123 additions and 227 deletions.
Expand Up @@ -4,7 +4,7 @@
from pants.engine.addresses import Addresses
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules


class ListAndDieForTestingSubsystem(GoalSubsystem):
Expand All @@ -25,4 +25,4 @@ def fast_list_and_die_for_testing(console: Console, addresses: Addresses) -> Lis


def rules():
return [fast_list_and_die_for_testing]
return register_rules()
Expand Up @@ -9,7 +9,7 @@
from pants.engine.console import Console
from pants.engine.fs import Digest, MergeDigests, Workspace
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSet, TargetsToValidFieldSets, TargetsToValidFieldSetsRequest
from pants.engine.unions import union
Expand Down Expand Up @@ -79,4 +79,4 @@ async def create_awslambda(


def rules():
return [create_awslambda]
return register_rules()
Expand Up @@ -30,7 +30,7 @@
from pants.core.util_rules import strip_source_roots
from pants.engine.fs import Digest, MergeDigests
from pants.engine.process import Process, ProcessResult
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get
from pants.engine.unions import UnionRule
from pants.python.python_setup import PythonSetup
Expand Down Expand Up @@ -129,10 +129,8 @@ async def setup_lambdex(lambdex: Lambdex) -> LambdexSetup:

def rules():
return [
create_python_awslambda,
setup_lambdex,
*register_rules(),
UnionRule(AWSLambdaFieldSet, PythonAwsLambdaFieldSet),
SubsystemRule(Lambdex),
*download_pex_bin.rules(),
*python_sources.rules(),
*pex.rules(),
Expand Down
5 changes: 2 additions & 3 deletions src/python/pants/backend/codegen/protobuf/python/rules.py
Expand Up @@ -11,7 +11,7 @@
from pants.engine.fs import AddPrefix, Digest, MergeDigests, RemovePrefix, Snapshot
from pants.engine.platform import Platform
from pants.engine.process import Process, ProcessResult
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import GeneratedSources, GenerateSourcesRequest, Sources, TransitiveTargets
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -121,7 +121,6 @@ async def generate_python_from_protobuf(

def rules():
return [
generate_python_from_protobuf,
*register_rules(),
UnionRule(GenerateSourcesRequest, GeneratePythonFromProtobufRequest),
SubsystemRule(Protoc),
]
5 changes: 2 additions & 3 deletions src/python/pants/backend/codegen/protobuf/target_types.py
Expand Up @@ -3,7 +3,7 @@

from pants.backend.codegen.protobuf.protoc import Protoc
from pants.engine.addresses import Address
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.target import (
COMMON_TARGET_FIELDS,
Dependencies,
Expand Down Expand Up @@ -51,7 +51,6 @@ def inject_dependencies(_: InjectProtobufDependencies, protoc: Protoc) -> Inject

def rules():
return [
inject_dependencies,
*register_rules(),
UnionRule(InjectDependenciesRequest, InjectProtobufDependencies),
SubsystemRule(Protoc),
]
4 changes: 2 additions & 2 deletions src/python/pants/backend/pants_info/list_target_types.py
Expand Up @@ -8,7 +8,7 @@
from pants.core.util_rules.pants_bin import PantsBin
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.target import (
AsyncField,
BoolField,
Expand Down Expand Up @@ -249,4 +249,4 @@ def list_target_types(


def rules():
return [list_target_types]
return register_rules()
7 changes: 2 additions & 5 deletions src/python/pants/backend/project_info/cloc.py
Expand Up @@ -20,7 +20,7 @@
from pants.engine.goal import Goal, GoalSubsystem
from pants.engine.platform import Platform
from pants.engine.process import Process, ProcessResult
from pants.engine.rules import SubsystemRule, goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get
from pants.util.strutil import pluralize

Expand Down Expand Up @@ -131,7 +131,4 @@ async def run_cloc(


def rules():
return [
run_cloc,
SubsystemRule(ClocBinary),
]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/dependees.py
Expand Up @@ -12,7 +12,7 @@
from pants.engine.collection import DeduplicatedCollection
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule, rule
from pants.engine.rules import goal_rule, register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import Dependencies, DependenciesRequest, Targets
from pants.util.frozendict import FrozenDict
Expand Down Expand Up @@ -182,4 +182,4 @@ async def dependees_goal(


def rules():
return [find_dependees, map_addresses_to_dependees, dependees_goal]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/dependencies.py
Expand Up @@ -9,7 +9,7 @@
from pants.engine.addresses import Addresses
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import Dependencies as DependenciesField
from pants.engine.target import DependenciesRequest, Targets, TransitiveTargets
Expand Down Expand Up @@ -104,4 +104,4 @@ async def dependencies(


def rules():
return [dependencies]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/filedeps.py
Expand Up @@ -9,7 +9,7 @@
from pants.engine.addresses import Address, Addresses, BuildFileAddress
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import (
HydratedSources,
Expand Down Expand Up @@ -120,4 +120,4 @@ async def file_deps(


def rules():
return [file_deps]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/filter_targets.py
Expand Up @@ -8,7 +8,7 @@
from pants.base.deprecated import resolve_conflicting_options
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.target import (
RegisteredTargetTypes,
Tags,
Expand Down Expand Up @@ -162,4 +162,4 @@ def filter_tag_regex(tag_regex: str) -> TargetFilter:


def rules():
return [filter_targets]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/list_roots.py
Expand Up @@ -3,7 +3,7 @@

from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.source.source_root import AllSourceRoots


Expand All @@ -28,4 +28,4 @@ async def list_roots(


def rules():
return [list_roots]
return register_rules()
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/list_targets.py
Expand Up @@ -6,7 +6,7 @@
from pants.engine.addresses import Address, Addresses
from pants.engine.console import Console
from pants.engine.goal import Goal, GoalSubsystem, LineOriented
from pants.engine.rules import goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get
from pants.engine.target import DescriptionField, ProvidesField, Targets

Expand Down Expand Up @@ -111,4 +111,4 @@ async def list_targets(


def rules():
return [list_targets]
return register_rules()
Expand Up @@ -12,7 +12,7 @@
from pants.engine.console import Console
from pants.engine.fs import Digest, DigestContents, SourcesSnapshot
from pants.engine.goal import Goal, GoalSubsystem
from pants.engine.rules import SubsystemRule, goal_rule
from pants.engine.rules import goal_rule, register_rules
from pants.engine.selectors import Get
from pants.subsystem.subsystem import Subsystem
from pants.util.frozendict import FrozenDict
Expand Down Expand Up @@ -334,4 +334,4 @@ async def validate(


def rules():
return [validate, SubsystemRule(SourceFileValidation)]
return register_rules()
Expand Up @@ -12,7 +12,7 @@
StripSourcesFieldRequest,
)
from pants.engine.addresses import Address
from pants.engine.rules import rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import (
HydratedSources,
Expand Down Expand Up @@ -166,8 +166,4 @@ async def map_module_to_address(


def rules():
return [
map_first_party_modules_to_addresses,
map_third_party_modules_to_addresses,
map_module_to_address,
]
return register_rules()
7 changes: 2 additions & 5 deletions src/python/pants/backend/python/dependency_inference/rules.py
Expand Up @@ -16,7 +16,7 @@
)
from pants.engine.fs import Digest, DigestContents
from pants.engine.internals.graph import Owners, OwnersRequest
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import (
HydratedSources,
Expand Down Expand Up @@ -158,13 +158,10 @@ async def infer_python_conftest_dependencies(

def rules():
return [
*register_rules(),
*inject_ancestor_files.rules(),
*module_mapper.rules(),
infer_python_dependencies,
infer_python_init_dependencies,
infer_python_conftest_dependencies,
UnionRule(InferDependenciesRequest, InferPythonDependencies),
UnionRule(InferDependenciesRequest, InferInitDependencies),
UnionRule(InferDependenciesRequest, InferConftestDependencies),
SubsystemRule(PythonInference),
]
6 changes: 2 additions & 4 deletions src/python/pants/backend/python/lint/bandit/rules.py
Expand Up @@ -24,7 +24,7 @@
)
from pants.engine.fs import Digest, MergeDigests, PathGlobs
from pants.engine.process import FallibleProcessResult, Process
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSetWithOrigin
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -153,9 +153,7 @@ async def bandit_lint(

def rules():
return [
bandit_lint,
bandit_lint_partition,
SubsystemRule(Bandit),
*register_rules(),
UnionRule(LintRequest, BanditRequest),
*download_pex_bin.rules(),
*determine_source_files.rules(),
Expand Down
7 changes: 2 additions & 5 deletions src/python/pants/backend/python/lint/black/rules.py
Expand Up @@ -28,7 +28,7 @@
)
from pants.engine.fs import EMPTY_SNAPSHOT, Digest, MergeDigests, PathGlobs
from pants.engine.process import FallibleProcessResult, Process, ProcessResult
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSetWithOrigin
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -189,10 +189,7 @@ async def black_lint(field_sets: BlackRequest, black: Black) -> LintResults:

def rules():
return [
setup,
black_fmt,
black_lint,
SubsystemRule(Black),
*register_rules(),
UnionRule(PythonFmtRequest, BlackRequest),
UnionRule(LintRequest, BlackRequest),
*download_pex_bin.rules(),
Expand Down
7 changes: 2 additions & 5 deletions src/python/pants/backend/python/lint/docformatter/rules.py
Expand Up @@ -26,7 +26,7 @@
)
from pants.engine.fs import EMPTY_SNAPSHOT, Digest, MergeDigests
from pants.engine.process import FallibleProcessResult, Process, ProcessResult
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSetWithOrigin
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -162,10 +162,7 @@ async def docformatter_lint(

def rules():
return [
setup,
docformatter_fmt,
docformatter_lint,
SubsystemRule(Docformatter),
*register_rules(),
UnionRule(PythonFmtRequest, DocformatterRequest),
UnionRule(LintRequest, DocformatterRequest),
*download_pex_bin.rules(),
Expand Down
6 changes: 2 additions & 4 deletions src/python/pants/backend/python/lint/flake8/rules.py
Expand Up @@ -30,7 +30,7 @@
)
from pants.engine.fs import Digest, DigestSubset, MergeDigests, PathGlobs, Snapshot
from pants.engine.process import FallibleProcessResult, Process
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSetWithOrigin
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -184,9 +184,7 @@ async def flake8_lint(

def rules():
return [
flake8_lint,
flake8_lint_partition,
SubsystemRule(Flake8),
*register_rules(),
UnionRule(LintRequest, Flake8Request),
*download_pex_bin.rules(),
*determine_source_files.rules(),
Expand Down
Expand Up @@ -7,10 +7,10 @@
from pants.backend.python.lint.flake8.rules import rules as flake8_rules
from pants.backend.python.target_types import PythonInterpreterCompatibility, PythonLibrary
from pants.base.specs import FilesystemLiteralSpec, OriginSpec, SingleAddress
from pants.core.goals.lint import LintResults, LintSubsystem
from pants.core.goals.lint import LintResults
from pants.engine.addresses import Address
from pants.engine.fs import DigestContents, FileContent
from pants.engine.rules import RootRule, SubsystemRule
from pants.engine.rules import RootRule
from pants.engine.selectors import Params
from pants.engine.target import TargetWithOrigin
from pants.testutil.external_tool_test_base import ExternalToolTestBase
Expand All @@ -30,7 +30,6 @@ def rules(cls):
*super().rules(),
*flake8_rules(),
RootRule(Flake8Request),
SubsystemRule(LintSubsystem),
)

def make_target_with_origin(
Expand Down
7 changes: 2 additions & 5 deletions src/python/pants/backend/python/lint/isort/rules.py
Expand Up @@ -26,7 +26,7 @@
)
from pants.engine.fs import EMPTY_SNAPSHOT, Digest, MergeDigests, PathGlobs
from pants.engine.process import FallibleProcessResult, Process, ProcessResult
from pants.engine.rules import SubsystemRule, rule
from pants.engine.rules import register_rules, rule
from pants.engine.selectors import Get, MultiGet
from pants.engine.target import FieldSetWithOrigin
from pants.engine.unions import UnionRule
Expand Down Expand Up @@ -187,10 +187,7 @@ async def isort_lint(request: IsortRequest, isort: Isort) -> LintResults:

def rules():
return [
setup,
isort_fmt,
isort_lint,
SubsystemRule(Isort),
*register_rules(),
UnionRule(PythonFmtRequest, IsortRequest),
UnionRule(LintRequest, IsortRequest),
*download_pex_bin.rules(),
Expand Down

0 comments on commit 0f26d8b

Please sign in to comment.