jaymd96-pants-baseline 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

{jaymd96_pants_baseline-0.2.4.dist-info → jaymd96_pants_baseline-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaymd96-pants-baseline
-Version: 0.2.4
+Version: 0.2.6
 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.2.4.dist-info → jaymd96_pants_baseline-0.2.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pants_baseline/__about__.py,sha256=_NHv1GsoomF9pLIMakvm__h8kOX9KbA_ONs3BVVqMWg,98
+pants_baseline/__about__.py,sha256=C-a3Rv_afKb0cDL-6XBO6DaexjrdHpEBEK8eHFMlaZM,98
 pants_baseline/__init__.py,sha256=uVRGi1D2gFjc7emmeewWdcvpO-NsUuKsMbX3rztOxWU,655
 pants_baseline/bundled_claude_plugins.py,sha256=rHchQRQ_UabOOKyQOxVwoyE2xLjE8eiUFVN7oERDCe0,1608
-pants_baseline/register.py,sha256=Ls_2XC-q53O_vY1PskcPBP0_cxrCp2smLfdji0ZRSlc,1712
+pants_baseline/register.py,sha256=_ahV7CRNWxv4lUXb03ZBM9vJnP4ekLw8DgnpInVK35o,1078
 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
@@ -11,8 +11,8 @@ 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=5VzHExJdvB00KrVIAuxlb7pwNfTC0djr5QzF8wXMYws,2906
-pants_baseline/rules/fmt_rules.py,sha256=QB4qgWyN_7PCSIG1hy2vzDXr8LVA4L7-sAJZvFiEfy4,4259
-pants_baseline/rules/lint_rules.py,sha256=dLWrZtTFY1KE_cIBbVN_i61JjtT63ItYMwkQjIO4PQU,4291
+pants_baseline/rules/fmt_rules.py,sha256=ft7kNO_zPCdKf6LoBEtAZRQu4byqDVdWKirkk9lNHEI,3860
+pants_baseline/rules/lint_rules.py,sha256=T_O9zVlx6NIz5k9w96RVDHhwS_jm3NR0Y7kEx4VBZoY,4433
 pants_baseline/rules/test_rules.py,sha256=Q_opWXkNS2IDSRQmDdYz-PETl9QEXgwaO_iPN4QWHjY,4268
 pants_baseline/rules/typecheck_rules.py,sha256=5jr7S9IPzDQOdO5kwwpn3q6m45GKJVlEDO2FN8wN6Ac,4579
 pants_baseline/subsystems/__init__.py,sha256=LteH_qmUIgRAnXYmmi7f6o894QfpY3hMNH5dlvJbSoM,387
@@ -20,7 +20,7 @@ pants_baseline/subsystems/baseline.py,sha256=CU8ZhNCJw8BSXSyuvZ1eH-Y2CSPggp2O-I2
 pants_baseline/subsystems/ruff.py,sha256=47fQg4fM_qzLGfxb_WFLYT1URL_4VxkJWw7LBOEQyT0,4248
 pants_baseline/subsystems/ty.py,sha256=F9F2YyYlbt1PlvsVP8qMAa_l0C-JezyjiDnBs4RMTIc,3722
 pants_baseline/subsystems/uv.py,sha256=z8gflmuuF0mEN4Bhlp29w2BlrM0M-4cYv7Y0wKhjOnk,3369
-jaymd96_pants_baseline-0.2.4.dist-info/METADATA,sha256=T6KkhV2DegjJJpMfFR6CKB2xJtEDtAE2lG5onWNB77k,8764
-jaymd96_pants_baseline-0.2.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jaymd96_pants_baseline-0.2.4.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
-jaymd96_pants_baseline-0.2.4.dist-info/RECORD,,
+jaymd96_pants_baseline-0.2.6.dist-info/METADATA,sha256=ezlwAxuQq--gcUWL2YCKKD-GoTdG_jj3crlgRaRjg3w,8764
+jaymd96_pants_baseline-0.2.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jaymd96_pants_baseline-0.2.6.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
+jaymd96_pants_baseline-0.2.6.dist-info/RECORD,,

pants_baseline/__about__.py

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

pants_baseline/register.py

@@ -2,19 +2,16 @@
 
 This module is the entry point for the Pants plugin system.
 It registers all rules, targets, and subsystems provided by this plugin.
+
+This plugin integrates with Pants' built-in lint, fmt, and check goals
+rather than providing custom goals.
 """
 
 from typing import Iterable
 
 from pants.engine.rules import Rule
 
-from pants_baseline.goals import audit as audit_goal
-from pants_baseline.goals import fmt as fmt_goal
-from pants_baseline.goals import lint as lint_goal
-from pants_baseline.goals import test as test_goal
-from pants_baseline.goals import typecheck as typecheck_goal
-from pants_baseline.rules import audit_rules, fmt_rules, lint_rules, test_rules, typecheck_rules
-from pants_baseline.subsystems import baseline, ruff, ty, uv
+from pants_baseline.rules import fmt_rules, lint_rules
 from pants_baseline.targets import BaselinePythonProject
 
 
@@ -26,23 +23,9 @@ def rules() -> Iterable[Rule]:
     rather than using collect_rules() which only collects @rule functions.
     """
     return [
-        # Subsystem rules (must be registered first for dependencies)
-        *baseline.rules(),
-        *ruff.rules(),
-        *ty.rules(),
-        *uv.rules(),
-        # Tool rules
+        # Tool rules (integrate with Pants built-in lint/fmt goals)
         *lint_rules.rules(),
         *fmt_rules.rules(),
-        *typecheck_rules.rules(),
-        *test_rules.rules(),
-        *audit_rules.rules(),
-        # Goal rules
-        *lint_goal.rules(),
-        *fmt_goal.rules(),
-        *typecheck_goal.rules(),
-        *test_goal.rules(),
-        *audit_goal.rules(),
     ]
 
 

pants_baseline/rules/fmt_rules.py

@@ -1,20 +1,19 @@
 """Rules for Ruff formatting."""
 
 from dataclasses import dataclass
-from typing import Iterable
+from typing import Any, Iterable
 
 from pants.core.goals.fmt import FmtResult, FmtTargetsRequest
-from pants.core.util_rules.external_tool import download_external_tool
+from pants.core.util_rules.external_tool import DownloadedExternalTool, download_external_tool
 from pants.core.util_rules.partitions import PartitionerType
-from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
-from pants.engine.fs import MergeDigests
-from pants.engine.internals.selectors import concurrently
-from pants.engine.intrinsics import merge_digests, execute_process, digest_to_snapshot
+from pants.engine.fs import Digest, MergeDigests, Snapshot
+from pants.engine.intrinsics import digest_to_snapshot, merge_digests
 from pants.engine.platform import Platform
-from pants.engine.process import Process
+from pants.engine.process import FallibleProcessResult, Process, execute_process_or_raise
 from pants.engine.rules import collect_rules, implicitly, rule
 from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
+from pants.util.meta import classproperty
 
 from pants_baseline.subsystems.baseline import BaselineSubsystem
 from pants_baseline.subsystems.ruff import RuffSubsystem
@@ -43,57 +42,41 @@ class RuffFmtRequest(FmtTargetsRequest):
     tool_subsystem = RuffSubsystem
     partitioner_type = PartitionerType.DEFAULT_SINGLE_PARTITION
 
+    @classproperty
+    def tool_name(cls) -> str:
+        return "baseline-ruff-fmt"
+
+    @classproperty
+    def tool_id(cls) -> str:
+        return "baseline-ruff-fmt"
+
 
 @rule(desc="Format with Ruff", level=LogLevel.DEBUG)
 async def run_ruff_fmt(
-    request: RuffFmtRequest.Batch,
+    request: RuffFmtRequest.Batch[RuffFmtFieldSet, Any],
     ruff_subsystem: RuffSubsystem,
     baseline_subsystem: BaselineSubsystem,
     platform: Platform,
 ) -> FmtResult:
     """Run Ruff formatter on Python files."""
+    if ruff_subsystem.skip:
+        return FmtResult.skip(request, formatter_name="baseline-ruff-fmt")
+
     if not baseline_subsystem.enabled:
-        return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
-            stdout="",
-            stderr="",
-            formatter_name="ruff",
-        )
-
-    if not request.elements:
-        return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
-            stdout="No targets to format",
-            stderr="",
-            formatter_name="ruff",
-        )
-
-    # Download ruff and get source files in parallel using new intrinsics
-    downloaded_ruff_get = download_external_tool(ruff_subsystem.get_request(platform))
-    sources_get = SourceFilesRequest(
-        sources_fields=[fs.sources for fs in request.elements],
-        for_sources_types=(BaselineSourcesField,),
-    )
+        return FmtResult.skip(request, formatter_name="baseline-ruff-fmt")
 
-    downloaded_ruff, sources = await concurrently(
-        downloaded_ruff_get,
-        implicitly(sources_get, SourceFiles),
-    )
+    snapshot = request.snapshot
+    if not snapshot.files:
+        return FmtResult.skip(request, formatter_name="baseline-ruff-fmt")
 
-    if not sources.files:
-        return FmtResult(
-            input=request.snapshot,
-            output=request.snapshot,
-            stdout="No files to format",
-            stderr="",
-            formatter_name="ruff",
-        )
+    # Download ruff
+    downloaded_ruff: DownloadedExternalTool = await download_external_tool(
+        ruff_subsystem.get_request(platform)
+    )
 
     # Merge the ruff binary with the source files
-    input_digest = await merge_digests(
-        MergeDigests([downloaded_ruff.digest, sources.snapshot.digest]),
+    input_digest: Digest = await merge_digests(
+        MergeDigests([downloaded_ruff.digest, snapshot.digest]),
     )
 
     # Build Ruff format command
@@ -104,26 +87,28 @@ async def run_ruff_fmt(
         f"--line-length={baseline_subsystem.line_length}",
         f"--quote-style={ruff_subsystem.quote_style}",
         f"--indent-style={ruff_subsystem.indent_style}",
-        *sources.files,
+        *snapshot.files,
     ]
 
-    process = Process(
+    process: Process = Process(
         argv=argv,
         input_digest=input_digest,
-        output_files=sources.files,
-        description=f"Run Ruff format on {len(sources.files)} files",
+        output_files=snapshot.files,
+        description=f"Run Ruff format on {len(snapshot.files)} files",
         level=LogLevel.DEBUG,
     )
 
-    result = await execute_process(process, **implicitly())
-    output_snapshot = await digest_to_snapshot(result.output_digest)
+    result: FallibleProcessResult = await execute_process_or_raise(
+        **implicitly({Process: process})
+    )
+    output_snapshot: Snapshot = await digest_to_snapshot(result.output_digest)
 
     return FmtResult(
-        input=sources.snapshot,
+        input=snapshot,
         output=output_snapshot,
         stdout=result.stdout.decode(),
         stderr=result.stderr.decode(),
-        formatter_name="ruff",
+        formatter_name="baseline-ruff-fmt",
     )
 
 

pants_baseline/rules/lint_rules.py

@@ -1,20 +1,20 @@
 """Rules for Ruff linting."""
 
 from dataclasses import dataclass
-from typing import Iterable
+from typing import Any, Iterable
 
 from pants.core.goals.lint import LintResult, LintTargetsRequest
-from pants.core.util_rules.external_tool import download_external_tool
+from pants.core.util_rules.external_tool import DownloadedExternalTool, download_external_tool
 from pants.core.util_rules.partitions import PartitionerType
-from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
-from pants.engine.fs import MergeDigests
-from pants.engine.internals.selectors import concurrently
-from pants.engine.intrinsics import merge_digests, execute_process
+from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest, determine_source_files
+from pants.engine.fs import Digest, MergeDigests
+from pants.engine.intrinsics import merge_digests
 from pants.engine.platform import Platform
-from pants.engine.process import Process
+from pants.engine.process import FallibleProcessResult, Process, execute_process_or_raise
 from pants.engine.rules import collect_rules, implicitly, rule
 from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
+from pants.util.meta import classproperty
 
 from pants_baseline.subsystems.baseline import BaselineSubsystem
 from pants_baseline.subsystems.ruff import RuffSubsystem
@@ -43,58 +43,50 @@ class RuffLintRequest(LintTargetsRequest):
     tool_subsystem = RuffSubsystem
     partitioner_type = PartitionerType.DEFAULT_SINGLE_PARTITION
 
+    @classproperty
+    def tool_name(cls) -> str:
+        return "baseline-ruff"
+
+    @classproperty
+    def tool_id(cls) -> str:
+        return "baseline-ruff"
+
 
 @rule(desc="Lint with Ruff", level=LogLevel.DEBUG)
 async def run_ruff_lint(
-    request: RuffLintRequest.Batch,
+    request: RuffLintRequest.Batch[RuffLintFieldSet, Any],
     ruff_subsystem: RuffSubsystem,
     baseline_subsystem: BaselineSubsystem,
     platform: Platform,
 ) -> LintResult:
     """Run Ruff linter on Python files."""
+    if ruff_subsystem.skip:
+        return LintResult.create(request, exit_code=0, stdout="", stderr="", strip_chroot_path=True)
+
     if not baseline_subsystem.enabled:
-        return LintResult(
-            exit_code=0,
-            stdout="",
-            stderr="",
-            linter_name="ruff",
-            partition_description=None,
-        )
+        return LintResult.create(request, exit_code=0, stdout="", stderr="", strip_chroot_path=True)
 
-    field_sets = request.elements
+    field_sets = list(request.elements)
 
     if not field_sets:
-        return LintResult(
-            exit_code=0,
-            stdout="No targets to lint",
-            stderr="",
-            linter_name="ruff",
-            partition_description=None,
-        )
+        return LintResult.create(request, exit_code=0, stdout="No targets to lint", stderr="", strip_chroot_path=True)
 
-    # Download ruff and get source files in parallel using new intrinsics
-    downloaded_ruff_get = download_external_tool(ruff_subsystem.get_request(platform))
-    sources_get = SourceFilesRequest(
-        sources_fields=[fs.sources for fs in field_sets],
-        for_sources_types=(BaselineSourcesField,),
+    # Download ruff and get source files
+    downloaded_ruff: DownloadedExternalTool = await download_external_tool(
+        ruff_subsystem.get_request(platform)
     )
-
-    downloaded_ruff, sources = await concurrently(
-        downloaded_ruff_get,
-        implicitly(sources_get, SourceFiles),
+    sources: SourceFiles = await determine_source_files(
+        SourceFilesRequest(
+            sources_fields=[fs.sources for fs in field_sets],
+            for_sources_types=(BaselineSourcesField,),
+        )
     )
 
     if not sources.files:
-        return LintResult(
-            exit_code=0,
-            stdout="No files to lint",
-            stderr="",
-            linter_name="ruff",
-            partition_description=None,
-        )
+        return LintResult.create(request, exit_code=0, stdout="No files to lint", stderr="", strip_chroot_path=True)
 
     # Merge the ruff binary with the source files
-    input_digest = await merge_digests(
+    input_digest: Digest = await merge_digests(
         MergeDigests([downloaded_ruff.digest, sources.snapshot.digest]),
     )
 
@@ -113,21 +105,23 @@ async def run_ruff_lint(
         *sources.files,
     ]
 
-    process = Process(
+    process: Process = Process(
         argv=argv,
         input_digest=input_digest,
         description=f"Run Ruff lint on {len(sources.files)} files",
         level=LogLevel.DEBUG,
     )
 
-    result = await execute_process(process, **implicitly())
+    result: FallibleProcessResult = await execute_process_or_raise(
+        **implicitly({Process: process})
+    )
 
-    return LintResult(
+    return LintResult.create(
+        request,
         exit_code=result.exit_code,
         stdout=result.stdout.decode(),
         stderr=result.stderr.decode(),
-        linter_name="ruff",
-        partition_description=request.partition_metadata,
+        strip_chroot_path=True,
     )