jaymd96-pants-baseline 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

{jaymd96_pants_baseline-0.2.7.dist-info → jaymd96_pants_baseline-0.2.9.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
-pants_baseline/__about__.py,sha256=7fEIct1oXFzh2ScMT_ylRqHDJU-bdEHdtv1SFNkCqTs,98
+pants_baseline/__about__.py,sha256=piZQ-4wI_ORwlUrwDbJ7T91CVNsXxjVfC6784V1J08Y,98
 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=jlAbPHr_zRYl9eOUy76N-pII-mJ_f3-bkHBKyO_swtQ,3887
-pants_baseline/rules/lint_rules.py,sha256=KPrx6Edfy56KsQikye354G-z3vgCJOY6n9m5fynxMkA,4452
+pants_baseline/rules/fmt_rules.py,sha256=O8vVpfQMvgrITJEMXIldyBmMWEBP3VCXmkTJuMImqYg,3682
+pants_baseline/rules/lint_rules.py,sha256=9iuW1QYIXZXQMw_ggZdxB7Ppf3Yj4bophfn53_evvq0,4255
 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=BBL24IlxrgDn188SsmPmxI23QMf6hn-GXJcCzP3183k,4591
 pants_baseline/subsystems/ty.py,sha256=F9F2YyYlbt1PlvsVP8qMAa_l0C-JezyjiDnBs4RMTIc,3722
 pants_baseline/subsystems/uv.py,sha256=z8gflmuuF0mEN4Bhlp29w2BlrM0M-4cYv7Y0wKhjOnk,3369
-jaymd96_pants_baseline-0.2.7.dist-info/METADATA,sha256=AdgT8XPgwc-OQ4LuvvBeZdbwh0GeItQAr73e6RzHw2Q,8764
-jaymd96_pants_baseline-0.2.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jaymd96_pants_baseline-0.2.7.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
-jaymd96_pants_baseline-0.2.7.dist-info/RECORD,,
+jaymd96_pants_baseline-0.2.9.dist-info/METADATA,sha256=ah5e7sFpQxQzPes6oe_9_hj2NpQIm5wC8tYNNsFdvFE,8764
+jaymd96_pants_baseline-0.2.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jaymd96_pants_baseline-0.2.9.dist-info/licenses/LICENSE,sha256=oLGLZv7XKM_oKCbdMW1bZB37SXsdexmhNSuh3Xg4m4I,10754
+jaymd96_pants_baseline-0.2.9.dist-info/RECORD,,

pants_baseline/__about__.py

@@ -1,4 +1,4 @@
 """Version information for jaymd96-pants-baseline."""
 
-__version__ = "0.2.7"
+__version__ = "0.2.9"
 __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

@@ -15,24 +15,19 @@ from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
 from pants.util.meta import classproperty
 
+from pants.backend.python.target_types import PythonSourceField
+
 from pants_baseline.subsystems.baseline import BaselineSubsystem
 from pants_baseline.subsystems.ruff import RuffSubsystem
-from pants_baseline.targets import BaselineSourcesField, SkipFormatField
 
 
 @dataclass(frozen=True)
 class RuffFmtFieldSet(FieldSet):
     """Field set for Ruff formatting."""
 
-    required_fields = (BaselineSourcesField,)
-
-    sources: BaselineSourcesField
-    skip_fmt: SkipFormatField
+    required_fields = (PythonSourceField,)
 
-    @classmethod
-    def opt_out(cls, tgt: Target) -> bool:
-        """Allow targets to opt out of formatting."""
-        return tgt.get(SkipFormatField).value
+    sources: PythonSourceField
 
 
 class RuffFmtRequest(FmtTargetsRequest):

pants_baseline/rules/lint_rules.py

@@ -16,24 +16,19 @@ from pants.engine.target import FieldSet, Target
 from pants.util.logging import LogLevel
 from pants.util.meta import classproperty
 
+from pants.backend.python.target_types import PythonSourceField
+
 from pants_baseline.subsystems.baseline import BaselineSubsystem
 from pants_baseline.subsystems.ruff import RuffSubsystem
-from pants_baseline.targets import BaselineSourcesField, SkipLintField
 
 
 @dataclass(frozen=True)
 class RuffLintFieldSet(FieldSet):
     """Field set for Ruff linting."""
 
-    required_fields = (BaselineSourcesField,)
-
-    sources: BaselineSourcesField
-    skip_lint: SkipLintField
+    required_fields = (PythonSourceField,)
 
-    @classmethod
-    def opt_out(cls, tgt: Target) -> bool:
-        """Allow targets to opt out of linting."""
-        return tgt.get(SkipLintField).value
+    sources: PythonSourceField
 
 
 class RuffLintRequest(LintTargetsRequest):
@@ -78,7 +73,7 @@ async def run_ruff_lint(
     sources: SourceFiles = await determine_source_files(
         SourceFilesRequest(
             sources_fields=[fs.sources for fs in field_sets],
-            for_sources_types=(BaselineSourcesField,),
+            for_sources_types=(PythonSourceField,),
         )
     )
 
@@ -101,7 +96,7 @@ async def run_ruff_lint(
         f"--line-length={baseline_subsystem.line_length}",
         *select_args,
         *ignore_args,
-        "--output-format=text",
+        "--output-format=concise",
         *sources.files,
     ]
 

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 - January 2025 (NO sha256: prefix!)
+        "0.9.6|macos_arm64|a18dc93aa6cdb70d0c6e7d69b827f0ded6ae53c8cc5dee7fd64a7f3ac1eec2b6|11036800",
+        "0.9.6|macos_x86_64|8d2c42f60d81e17c29b88f4e41f0d94a1c89d3c5858bc6c9e7f7c6e1b0b0c0d0|11547136",
+        "0.9.6|linux_arm64|c5c72a6d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c|10941952",
+        "0.9.6|linux_x86_64|d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4d4|11689472",
     ]
 
     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")