jaymd96-pants-baseline 0.2.8__py3-none-any.whl → 0.2.13__py3-none-any.whl

{jaymd96_pants_baseline-0.2.8.dist-info → jaymd96_pants_baseline-0.2.13.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
-pants_baseline/__about__.py,sha256=rYvO_FgZBX0E61te4WmlaIkWMVFRmzs4_mVxriX6Ut8,98
+pants_baseline/__about__.py,sha256=On-8H4CVaZnmDHdrclfVLENOgMLUZoIe0eVC5y4_GDg,99
 pants_baseline/__init__.py,sha256=uVRGi1D2gFjc7emmeewWdcvpO-NsUuKsMbX3rztOxWU,655
 pants_baseline/bundled_claude_plugins.py,sha256=rHchQRQ_UabOOKyQOxVwoyE2xLjE8eiUFVN7oERDCe0,1608
-pants_baseline/register.py,sha256=_ahV7CRNWxv4lUXb03ZBM9vJnP4ekLw8DgnpInVK35o,1078
+pants_baseline/register.py,sha256=1ROcYLg3JYoHIxxaytrEFHuqL3cvCmKWqkNIl7G6RpU,1426
 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,16 +11,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=5VzHExJdvB00KrVIAuxlb7pwNfTC0djr5QzF8wXMYws,2906
-pants_baseline/rules/fmt_rules.py,sha256=O8vVpfQMvgrITJEMXIldyBmMWEBP3VCXmkTJuMImqYg,3682
-pants_baseline/rules/lint_rules.py,sha256=EdHmydXbAom2p3vPdq_JGS8ZrylQZ0UPtn-TWYOBoPI,4252
+pants_baseline/rules/fmt_rules.py,sha256=p7nvsISynBDkCGDOjgleEKwW7cmgs3YDSIQEOTGvur0,3447
+pants_baseline/rules/lint_rules.py,sha256=TP5x52cVPXPFaxWFtdGptL5RTXkDmGpRBJsZ33TTUYI,4200
 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
 pants_baseline/subsystems/baseline.py,sha256=CU8ZhNCJw8BSXSyuvZ1eH-Y2CSPggp2O-I2bVqF3WEU,2187
-pants_baseline/subsystems/ruff.py,sha256=47fQg4fM_qzLGfxb_WFLYT1URL_4VxkJWw7LBOEQyT0,4248
+pants_baseline/subsystems/ruff.py,sha256=qUt7cFVpaVYrrbzY6U6hCTloqny3KopyJ4I7UJPX3X0,4610
 pants_baseline/subsystems/ty.py,sha256=F9F2YyYlbt1PlvsVP8qMAa_l0C-JezyjiDnBs4RMTIc,3722
 pants_baseline/subsystems/uv.py,sha256=z8gflmuuF0mEN4Bhlp29w2BlrM0M-4cYv7Y0wKhjOnk,3369
-jaymd96_pants_baseline-0.2.8.dist-info/METADATA,sha256=EoHbSJMNHtdFpzOilFP2Qkbq4uIoonk1ZUpBVGMl0UQ,8764
-jaymd96_pants_baseline-0.2.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jaymd96_pants_baseline-0.2.8.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
-jaymd96_pants_baseline-0.2.8.dist-info/RECORD,,
+jaymd96_pants_baseline-0.2.13.dist-info/METADATA,sha256=sXYVvhf7dCZ17cLRud1aJJqxXDNTnmienK1dXGD25q8,8765
+jaymd96_pants_baseline-0.2.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jaymd96_pants_baseline-0.2.13.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
+jaymd96_pants_baseline-0.2.13.dist-info/RECORD,,

pants_baseline/__about__.py

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

pants_baseline/register.py

@@ -7,11 +7,14 @@ This plugin integrates with Pants' built-in lint, fmt, and check goals
 rather than providing custom goals.
 """
 
-from typing import Iterable
+from typing import Iterable, Type
 
 from pants.engine.rules import Rule
+from pants.option.subsystem import Subsystem
 
 from pants_baseline.rules import fmt_rules, lint_rules
+from pants_baseline.subsystems.baseline import BaselineSubsystem
+from pants_baseline.subsystems.ruff import RuffSubsystem
 from pants_baseline.targets import BaselinePythonProject
 
 
@@ -32,3 +35,11 @@ def rules() -> Iterable[Rule]:
 def target_types() -> Iterable[type]:
     """Return all custom target types provided by this plugin."""
     return [BaselinePythonProject]
+
+
+def subsystems() -> Iterable[Type[Subsystem]]:
+    """Return all subsystems provided by this plugin."""
+    return [
+        BaselineSubsystem,
+        RuffSubsystem,
+    ]

pants_baseline/rules/fmt_rules.py

@@ -6,12 +6,12 @@ from typing import Any, Iterable
 from pants.core.goals.fmt import FmtResult, FmtTargetsRequest
 from pants.core.util_rules.external_tool import DownloadedExternalTool, download_external_tool
 from pants.core.util_rules.partitions import PartitionerType
-from pants.engine.fs import Digest, MergeDigests, Snapshot
-from pants.engine.intrinsics import digest_to_snapshot, merge_digests
+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 FallibleProcessResult, Process, execute_process_or_raise
 from pants.engine.rules import collect_rules, implicitly, rule
-from pants.engine.target import FieldSet, Target
+from pants.engine.target import FieldSet
 from pants.util.logging import LogLevel
 from pants.util.meta import classproperty
 
@@ -75,13 +75,12 @@ async def run_ruff_fmt(
     )
 
     # Build Ruff format command
+    # Note: quote-style and indent-style are config file options only in ruff 0.9+
     argv = [
         downloaded_ruff.exe,
         "format",
         f"--target-version=py{baseline_subsystem.python_version.replace('.', '')}",
         f"--line-length={baseline_subsystem.line_length}",
-        f"--quote-style={ruff_subsystem.quote_style}",
-        f"--indent-style={ruff_subsystem.indent_style}",
         *snapshot.files,
     ]
 
@@ -96,15 +95,9 @@ async def run_ruff_fmt(
             )
         )
     )
-    output_snapshot: Snapshot = await digest_to_snapshot(result.output_digest)
-
-    return FmtResult(
-        input=snapshot,
-        output=output_snapshot,
-        stdout=result.stdout.decode(),
-        stderr=result.stderr.decode(),
-        formatter_name="baseline-ruff-fmt",
-    )
+
+    # FmtResult.create() is async and takes 2 args in Pants 2.30+
+    return await FmtResult.create(request, result)
 
 
 def rules() -> Iterable:

pants_baseline/rules/lint_rules.py

@@ -8,11 +8,11 @@ from pants.core.util_rules.external_tool import DownloadedExternalTool, download
 from pants.core.util_rules.partitions import PartitionerType
 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.intrinsics import execute_process, merge_digests
 from pants.engine.platform import Platform
-from pants.engine.process import FallibleProcessResult, Process, execute_process_or_raise
+from pants.engine.process import Process
 from pants.engine.rules import collect_rules, implicitly, rule
-from pants.engine.target import FieldSet, Target
+from pants.engine.target import FieldSet
 from pants.util.logging import LogLevel
 from pants.util.meta import classproperty
 
@@ -89,35 +89,31 @@ async def run_ruff_lint(
     select_args = [f"--select={','.join(ruff_subsystem.select)}"] if ruff_subsystem.select else []
     ignore_args = [f"--ignore={','.join(ruff_subsystem.ignore)}"] if ruff_subsystem.ignore else []
 
+    # Build Ruff check command
+    # Note: line-length is a config file option only in ruff 0.9+
     argv = [
         downloaded_ruff.exe,
         "check",
         f"--target-version=py{baseline_subsystem.python_version.replace('.', '')}",
-        f"--line-length={baseline_subsystem.line_length}",
         *select_args,
         *ignore_args,
-        "--output-format=text",
+        "--output-format=concise",
         *sources.files,
     ]
 
-    result: FallibleProcessResult = await execute_process_or_raise(
-        **implicitly(
-            Process(
-                argv=argv,
-                input_digest=input_digest,
-                description=f"Run Ruff lint on {len(sources.files)} files",
-                level=LogLevel.DEBUG,
-            )
-        )
+    # execute_process returns FallibleProcessResult which LintResult.create accepts directly
+    process_result = await execute_process(
+        Process(
+            argv=argv,
+            input_digest=input_digest,
+            description=f"Run Ruff lint on {len(sources.files)} files",
+            level=LogLevel.DEBUG,
+        ),
+        **implicitly(),
     )
 
-    return LintResult.create(
-        request,
-        exit_code=result.exit_code,
-        stdout=result.stdout.decode(),
-        stderr=result.stderr.decode(),
-        strip_chroot_path=True,
-    )
+    # LintResult.create() takes 2 args in Pants 2.30+
+    return LintResult.create(request, process_result)
 
 
 def rules() -> Iterable:

pants_baseline/subsystems/ruff.py

@@ -22,11 +22,11 @@ class RuffSubsystem(ExternalTool):
 
     default_version = "0.9.6"
     default_known_versions = [
-        # Ruff 0.9.6 - January 2025
-        "0.9.6|macos_arm64|sha256:a18dc93aa6cdb70d0c6e7d69b827f0ded6ae53c8cc5dee7fd64a7f3ac1eec2b6|11036800",
-        "0.9.6|macos_x86_64|sha256:8d2c42f60d81e17c29b88f4e41f0d94a1c89d3c5858bc6c9e7f7c6e1b0b0c0d0|11547136",
-        "0.9.6|linux_arm64|sha256:c5c72a6d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c|10941952",
-        "0.9.6|linux_x86_64|sha256:d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4|11689472",
+        # Ruff 0.9.6 - Format: version|platform|sha256_hash|file_size_bytes
+        "0.9.6|macos_arm64|a3132eb5e3d95f36d378144082276fbed0309789dadb19d8a4c41ec5e80451fb|11124436",
+        "0.9.6|macos_x86_64|ec88c095036b25e95391ea202fcc9496d565f4e43152db10785eb9757ea0815d|11663591",
+        "0.9.6|linux_arm64|cf796c953def5a7102002372893942fac875ac718355698a4a70405104dfbb6c|11946730",
+        "0.9.6|linux_x86_64|bed850f15d4d5aaaef2b6a131bfecd5b9d7d3191596249d07e576bd9fd37078e|12511815",
     ]
 
     def generate_url(self, plat: Platform) -> str:
@@ -43,7 +43,14 @@ class RuffSubsystem(ExternalTool):
 
     def generate_exe(self, plat: Platform) -> str:
         """Return the path to the ruff executable within the downloaded archive."""
-        return "ruff"
+        platform_mapping = {
+            "macos_arm64": "aarch64-apple-darwin",
+            "macos_x86_64": "x86_64-apple-darwin",
+            "linux_arm64": "aarch64-unknown-linux-gnu",
+            "linux_x86_64": "x86_64-unknown-linux-gnu",
+        }
+        plat_str = platform_mapping.get(plat.value, "x86_64-unknown-linux-gnu")
+        return f"ruff-{plat_str}/ruff"
 
     # Skip option required by Pants for tool subsystems
     skip = SkipOption("lint", "fmt")