jaymd96-pants-baseline 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

{jaymd96_pants_baseline-0.1.8.dist-info → jaymd96_pants_baseline-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaymd96-pants-baseline
-Version: 0.1.8
+Version: 0.1.10
 Summary: Opinionated Python code quality baseline plugin for Pants build system
 Project-URL: Homepage, https://github.com/jaymd96/pants-baseline
 Project-URL: Repository, https://github.com/jaymd96/pants-baseline.git

{jaymd96_pants_baseline-0.1.8.dist-info → jaymd96_pants_baseline-0.1.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-pants_baseline/__about__.py,sha256=l_vH1QXH_vDNHG3AU23KjRrvtS98imz1W4X4va10mfI,98
+pants_baseline/__about__.py,sha256=gA6PwyUIMFpJMjnryFcu8PLgyYfMETKQQRSAzoOqAz4,99
 pants_baseline/__init__.py,sha256=uVRGi1D2gFjc7emmeewWdcvpO-NsUuKsMbX3rztOxWU,655
-pants_baseline/register.py,sha256=MGOvpu2gCbv9sa-aYnsb-fsGilKi2I1yVpNARWFggCM,1528
+pants_baseline/register.py,sha256=gdODsaI7VIzU2tGONANsg9KbKZkHidmLs2AyvUNIypg,1675
 pants_baseline/targets.py,sha256=Z9O09Aqd5inMqwIUFt4HSE9HtWjn8pGSU4FZHg22Tpo,3379
 pants_baseline/goals/__init__.py,sha256=pf6KU2CIQuDkx8ER3IS0H-kuNbBtX-AH5B5SnSP9_yw,192
 pants_baseline/goals/audit.py,sha256=i7zyyKssWw6EE2zN5putWP9sikkcjUKn7g3Jrapv994,2380
@@ -10,16 +10,16 @@ pants_baseline/goals/test.py,sha256=THW4kJAFbAzPCjLbq1dxg81T19QdywXYiwTNKSB4z8M,
 pants_baseline/goals/typecheck.py,sha256=nqfwy1BZqhEzlDX-_hme9mKuDI2KqH-XpN4ygzWMQ6Y,2626
 pants_baseline/rules/__init__.py,sha256=UpvDpGVImhRfp2_VeUNsRPGiWjBbMI6AV1-Yx3kS0Gg,252
 pants_baseline/rules/audit_rules.py,sha256=gr-2u0u07z62Q42c9vXVGJng8UPIP5JzZ-SKrl9z7yM,2762
-pants_baseline/rules/fmt_rules.py,sha256=-Fb_mtlB0x2z2nlq9JlAt9AQg19Rh8EXZOUpBg7QSmc,4060
-pants_baseline/rules/lint_rules.py,sha256=euJFt8vivWBpGFuTIJttQmLxQ8MWPUYOlKdqeVbo1rg,4018
+pants_baseline/rules/fmt_rules.py,sha256=O-JQVk565H8w6jlsG-cqndzNaig3alepqTV0zKhfyDw,4174
+pants_baseline/rules/lint_rules.py,sha256=rYsbaPyYNDVDJn_dF91ews8iskcj2QoqnzZInLxkIzc,4219
 pants_baseline/rules/test_rules.py,sha256=jj4lk3-mueOPujPFPK2TCdBFZZA_vovdDdHED9jGp7U,4225
-pants_baseline/rules/typecheck_rules.py,sha256=dJg0-CeXo6Sqfjp3Ksm-MjVDuKi24C-31u-zoJNYmOM,4324
+pants_baseline/rules/typecheck_rules.py,sha256=XmL6uIXwjphB1YDVMrCM6A_Wa_1H-gHuLg8x59v_YQo,4499
 pants_baseline/subsystems/__init__.py,sha256=LteH_qmUIgRAnXYmmi7f6o894QfpY3hMNH5dlvJbSoM,387
 pants_baseline/subsystems/baseline.py,sha256=KWDRMdLOUN5cNHntY8f97bSsoITXwmX4ET6n2aW-cRk,2049
-pants_baseline/subsystems/ruff.py,sha256=8E59R2V55RNpGJvqmQ4r-68Z5vN0rC0sV0OG527muiM,3835
+pants_baseline/subsystems/ruff.py,sha256=NW0AFv59-j6ANkZG8LjvuXPzWBD4yDsEr7Pb6eZbdck,3941
 pants_baseline/subsystems/ty.py,sha256=OpaU8Z7Bk6kj5QAfhPom5L9v8sKNR8XF664_U5mUVJw,3419
 pants_baseline/subsystems/uv.py,sha256=dXmVzg4ZxzHa4g_TowEZXMYuhKiTOHjqqadkNrZQ9jk,3066
-jaymd96_pants_baseline-0.1.8.dist-info/METADATA,sha256=qXlVqaMKIOw3CV7yMAXVFNEzibYmDIs1Hli2275aOG8,7934
-jaymd96_pants_baseline-0.1.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jaymd96_pants_baseline-0.1.8.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
-jaymd96_pants_baseline-0.1.8.dist-info/RECORD,,
+jaymd96_pants_baseline-0.1.10.dist-info/METADATA,sha256=D1fkzXNiYUzeX9dwCowPYkGkdEw-gr26O6BRkFklHrQ,7935
+jaymd96_pants_baseline-0.1.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jaymd96_pants_baseline-0.1.10.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
+jaymd96_pants_baseline-0.1.10.dist-info/RECORD,,

pants_baseline/__about__.py

@@ -1,4 +1,4 @@
 """Version information for jaymd96-pants-baseline."""
 
-__version__ = "0.1.8"
+__version__ = "0.1.10"
 __author__ = "James"

pants_baseline/register.py

@@ -6,7 +6,7 @@ It registers all rules, targets, and subsystems provided by this plugin.
 
 from typing import Iterable
 
-from pants.engine.rules import Rule, collect_rules
+from pants.engine.rules import Rule
 
 from pants_baseline.goals import audit as audit_goal
 from pants_baseline.goals import fmt as fmt_goal
@@ -22,18 +22,23 @@ from pants_baseline.targets import BaselinePythonProject
 
 
 def rules() -> Iterable[Rule]:
-    """Return all rules provided by this plugin."""
+    """Return all rules provided by this plugin.
+
+    Each module's rules() function returns both @rule decorated functions
+    AND UnionRule registrations. We must call the rules() functions directly
+    rather than using collect_rules() which only collects @rule functions.
+    """
     return [
-        *collect_rules(lint_rules),
-        *collect_rules(fmt_rules),
-        *collect_rules(typecheck_rules),
-        *collect_rules(test_rules),
-        *collect_rules(audit_rules),
-        *collect_rules(lint_goal),
-        *collect_rules(fmt_goal),
-        *collect_rules(typecheck_goal),
-        *collect_rules(test_goal),
-        *collect_rules(audit_goal),
+        *lint_rules.rules(),
+        *fmt_rules.rules(),
+        *typecheck_rules.rules(),
+        *test_rules.rules(),
+        *audit_rules.rules(),
+        *lint_goal.rules(),
+        *fmt_goal.rules(),
+        *typecheck_goal.rules(),
+        *test_goal.rules(),
+        *audit_goal.rules(),
     ]
 
 

pants_baseline/rules/fmt_rules.py

@@ -3,15 +3,14 @@
 from dataclasses import dataclass
 from typing import Iterable
 
-from pants.core.goals.fmt import FmtResult, FmtTargetsRequest
+from pants.core.goals.fmt import FmtResult, FmtTargetsRequest, PartitionerType
 from pants.core.util_rules.external_tool import DownloadedExternalTool, ExternalToolRequest
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
 from pants.engine.fs import Digest, MergeDigests, Snapshot
 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 FieldSet
-from pants.engine.unions import UnionRule
+from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
 
 from pants_baseline.subsystems.baseline import BaselineSubsystem
@@ -28,38 +27,44 @@ class RuffFmtFieldSet(FieldSet):
     sources: BaselineSourcesField
     skip_fmt: SkipFormatField
 
+    @classmethod
+    def opt_out(cls, tgt: Target) -> bool:
+        """Allow targets to opt out of formatting."""
+        return tgt.get(SkipFormatField).value
+
 
 class RuffFmtRequest(FmtTargetsRequest):
     """Request to run Ruff formatting."""
 
     field_set_type = RuffFmtFieldSet
-    tool_name = "ruff"
+    tool_subsystem = RuffSubsystem
+    partitioner_type = PartitionerType.DEFAULT_SINGLE_PARTITION
 
 
 @rule(desc="Format with Ruff", level=LogLevel.DEBUG)
 async def run_ruff_fmt(
-    request: RuffFmtRequest,
+    request: RuffFmtRequest.Batch,
     ruff_subsystem: RuffSubsystem,
     baseline_subsystem: BaselineSubsystem,
     platform: Platform,
 ) -> FmtResult:
     """Run Ruff formatter on Python files."""
+    field_sets = request.elements
+    snapshot = request.snapshot
+
     if not baseline_subsystem.enabled:
         return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
+            input=snapshot,
+            output=snapshot,
             stdout="",
             stderr="",
             formatter_name="ruff",
         )
 
-    # Filter out skipped targets
-    field_sets = [fs for fs in request.field_sets if not fs.skip_fmt.value]
-
     if not field_sets:
         return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
+            input=snapshot,
+            output=snapshot,
             stdout="No targets to format",
             stderr="",
             formatter_name="ruff",
@@ -79,8 +84,8 @@ async def run_ruff_fmt(
 
     if not sources.files:
         return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
+            input=snapshot,
+            output=snapshot,
             stdout="No files to format",
             stderr="",
             formatter_name="ruff",
@@ -129,5 +134,5 @@ def rules() -> Iterable:
     """Return all format rules."""
     return [
         *collect_rules(),
-        UnionRule(FmtTargetsRequest, RuffFmtRequest),
+        *RuffFmtRequest.rules(),
     ]

pants_baseline/rules/lint_rules.py

@@ -3,15 +3,15 @@
 from dataclasses import dataclass
 from typing import Iterable
 
-from pants.core.goals.lint import LintResult, LintTargetsRequest
+from pants.core.goals.lint import LintResult, LintTargetsRequest, PartitionerType
 from pants.core.util_rules.external_tool import DownloadedExternalTool, ExternalToolRequest
+from pants.core.util_rules.partitions import Partitions
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
 from pants.engine.fs import Digest, MergeDigests
 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 FieldSet
-from pants.engine.unions import UnionRule
+from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
 
 from pants_baseline.subsystems.baseline import BaselineSubsystem
@@ -28,17 +28,23 @@ class RuffLintFieldSet(FieldSet):
     sources: BaselineSourcesField
     skip_lint: SkipLintField
 
+    @classmethod
+    def opt_out(cls, tgt: Target) -> bool:
+        """Allow targets to opt out of linting."""
+        return tgt.get(SkipLintField).value
+
 
 class RuffLintRequest(LintTargetsRequest):
     """Request to run Ruff linting."""
 
     field_set_type = RuffLintFieldSet
-    tool_name = "ruff"
+    tool_subsystem = RuffSubsystem
+    partitioner_type = PartitionerType.DEFAULT_SINGLE_PARTITION
 
 
 @rule(desc="Lint with Ruff", level=LogLevel.DEBUG)
 async def run_ruff_lint(
-    request: RuffLintRequest,
+    request: RuffLintRequest.Batch,
     ruff_subsystem: RuffSubsystem,
     baseline_subsystem: BaselineSubsystem,
     platform: Platform,
@@ -53,8 +59,7 @@ async def run_ruff_lint(
             partition_description=None,
         )
 
-    # Filter out skipped targets
-    field_sets = [fs for fs in request.field_sets if not fs.skip_lint.value]
+    field_sets = request.elements
 
     if not field_sets:
         return LintResult(
@@ -121,7 +126,7 @@ async def run_ruff_lint(
         stdout=result.stdout.decode(),
         stderr=result.stderr.decode(),
         linter_name="ruff",
-        partition_description=None,
+        partition_description=request.partition_metadata,
     )
 
 
@@ -129,5 +134,5 @@ def rules() -> Iterable:
     """Return all lint rules."""
     return [
         *collect_rules(),
-        UnionRule(LintTargetsRequest, RuffLintRequest),
+        *RuffLintRequest.rules(),
     ]

pants_baseline/rules/typecheck_rules.py

@@ -10,7 +10,7 @@ from pants.engine.fs import Digest, MergeDigests
 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 FieldSet
+from pants.engine.target import FieldSet, Target
 from pants.engine.unions import UnionRule
 from pants.util.logging import LogLevel
 
@@ -28,6 +28,11 @@ class TyFieldSet(FieldSet):
     sources: BaselineSourcesField
     skip_typecheck: SkipTypecheckField
 
+    @classmethod
+    def opt_out(cls, tgt: Target) -> bool:
+        """Allow targets to opt out of type checking."""
+        return tgt.get(SkipTypecheckField).value
+
 
 class TyCheckRequest(CheckRequest):
     """Request to run ty type checking."""

pants_baseline/subsystems/ruff.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from pants.core.util_rules.external_tool import ExternalTool
 from pants.engine.platform import Platform
-from pants.option.option_types import BoolOption, StrListOption, StrOption
+from pants.option.option_types import BoolOption, SkipOption, StrListOption, StrOption
 
 
 class RuffSubsystem(ExternalTool):
@@ -42,6 +42,9 @@ class RuffSubsystem(ExternalTool):
         """Return the path to the ruff executable within the downloaded archive."""
         return "ruff"
 
+    # Skip option required by Pants for tool subsystems
+    skip = SkipOption("lint", "fmt")
+
     # Linting configuration
     select = StrListOption(
         default=[