usethis tool ruff with pytest configures PT rules to be disabled for non-test dirs (#1252)

nathanjmcdougall · web-flow · commit bd54adf5b9a7 · 2025-12-30T20:32:08.000+13:00
diff --git a/src/usethis/_tool/impl/pytest.py b/src/usethis/_tool/impl/pytest.py
@@ -162,7 +162,7 @@ def get_managed_files(self) -> list[Path]:
         return [Path(".pytest.ini"), Path("pytest.ini"), Path("tests/conftest.py")]
 
     def get_rule_config(self) -> RuleConfig:
-        return RuleConfig(selected=["PT"])
+        return RuleConfig(selected=["PT"], nontests_unmanaged_ignored=["PT"])
 
     def get_active_config_file_managers(self) -> set[KeyValueFileManager]:
         # This is a variant of the "first" method
diff --git a/src/usethis/_tool/impl/ruff.py b/src/usethis/_tool/impl/ruff.py
@@ -482,11 +482,14 @@ def apply_rule_config(self, rule_config: RuleConfig) -> None:
             alert_only=(is_selected or is_ignored) or usethis_config.alert_only,
             instruct_only=(is_selected or is_ignored) or usethis_config.instruct_only,
         ):
-            # Only add test directory ignore rules if the tests directory exists
+            # Only add test-related directory ignore rules if the tests directory exists
             if (usethis_config.cpd() / "tests").exists():
                 self.ignore_rules_in_glob(
                     rule_config.tests_unmanaged_ignored, glob="tests/**"
                 )
+                self.ignore_rules_in_glob(
+                    rule_config.nontests_unmanaged_ignored, glob="!tests/**/*.py"
+                )
 
     def remove_rule_config(self, rule_config: RuleConfig) -> None:
         """Remove the Ruff rules associated with a rule config from the project.
diff --git a/src/usethis/_tool/rule.py b/src/usethis/_tool/rule.py
@@ -30,13 +30,16 @@ class RuleConfig(BaseModel):
         unmanaged_ignored: Unmanaged ignored rules.
         tests_unmanaged_ignored: Unmanaged cases of rules ignored for specifically the
                                  tests directory.
+        nontests_unmanaged_ignored: Unmanaged cases of rules ignored for specifically
+                                    non-test directories (using !tests/**/*.py glob).
     """
 
     selected: list[Rule] = Field(default_factory=list)
     ignored: list[Rule] = Field(default_factory=list)
     unmanaged_selected: list[Rule] = Field(default_factory=list)
     unmanaged_ignored: list[Rule] = Field(default_factory=list)
     tests_unmanaged_ignored: list[Rule] = Field(default_factory=list)
+    nontests_unmanaged_ignored: list[Rule] = Field(default_factory=list)
 
     def get_all_selected(self) -> list[Rule]:
         """Get all (project-scope) selected rules."""
@@ -68,12 +71,13 @@ def empty(self) -> bool:
             and not self.unmanaged_selected
             and not self.unmanaged_ignored
             and not self.tests_unmanaged_ignored
+            and not self.nontests_unmanaged_ignored
         )
 
     @property
     def is_related_to_tests(self) -> bool:
         """Check if the rule config has any tests-related rules."""
-        return bool(self.tests_unmanaged_ignored)
+        return bool(self.tests_unmanaged_ignored or self.nontests_unmanaged_ignored)
 
     def __repr__(self) -> str:
         """Representation which omits empty-list fields."""
@@ -88,6 +92,8 @@ def __repr__(self) -> str:
             args.append(f"unmanaged_ignored={self.unmanaged_ignored}")
         if self.tests_unmanaged_ignored:
             args.append(f"tests_unmanaged_ignored={self.tests_unmanaged_ignored}")
+        if self.nontests_unmanaged_ignored:
+            args.append(f"nontests_unmanaged_ignored={self.nontests_unmanaged_ignored}")
         arg_str = ", ".join(args)
         return f"RuleConfig({arg_str})"
 
@@ -115,4 +121,7 @@ def __or__(self, other: Self) -> Self:
         new.tests_unmanaged_ignored = (
             self.tests_unmanaged_ignored + other.tests_unmanaged_ignored
         )
+        new.nontests_unmanaged_ignored = (
+            self.nontests_unmanaged_ignored + other.nontests_unmanaged_ignored
+        )
         return new
diff --git a/tests/usethis/_core/test_core_tool.py b/tests/usethis/_core/test_core_tool.py
@@ -2741,6 +2741,32 @@ def test_ruff_import_linter_integration_adds_test_dir_ignores(
                 # Verify that INP rules are ignored in tests/** after pytest creates tests/
                 assert "INP" in RuffTool().get_ignored_rules_in_glob("tests/**")
 
+        @pytest.mark.usefixtures("_vary_network_conn")
+        def test_pytest_then_ruff_ignores_pt_in_nontests(self, uv_init_dir: Path):
+            with change_cwd(uv_init_dir), files_manager():
+                # Arrange
+                use_pytest()
+
+                # Act
+                use_ruff()
+
+                # Assert
+                # Verify that PT rules are ignored in non-test files (!tests/**/*.py)
+                assert "PT" in RuffTool().get_ignored_rules_in_glob("!tests/**/*.py")
+
+        @pytest.mark.usefixtures("_vary_network_conn")
+        def test_ruff_then_pytest_ignores_pt_in_nontests(self, uv_init_dir: Path):
+            with change_cwd(uv_init_dir), files_manager():
+                # Arrange
+                use_ruff()
+
+                # Act
+                use_pytest()
+
+                # Assert
+                # Verify that PT rules are ignored in non-test files (!tests/**/*.py)
+                assert "PT" in RuffTool().get_ignored_rules_in_glob("!tests/**/*.py")
+
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_pytest_ini_priority(self, uv_init_dir: Path):
             # Arrange
