Update rules refused in main and fixed upstream

Author: Avasam

lib/ts_utils/paths.py

@@ -24,7 +24,8 @@ def distribution_path(distribution_name: str) -> Path:
 def tests_path(distribution_name: str) -> Path:
     if distribution_name == "stdlib":
         return STDLIB_PATH / TESTS_DIR
-    return STUBS_PATH / distribution_name / TESTS_DIR
+    else:
+        return STUBS_PATH / distribution_name / TESTS_DIR
 
 
 def test_cases_path(distribution_name: str) -> Path:

pyproject.toml

@@ -53,17 +53,12 @@ select = [
     "FA", # flake8-future-annotations
     "FBT", # flake8-boolean-trap
     "FLY", # flynt
-    "G", # flake8-logging-format
     "I", # isort
     "ISC", # flake8-implicit-str-concat
-    "LOG", # flake8-logging
     "N", # pep8-naming
-    "NPY", # NumPy-specific rules
-    "PERF", # Perflint
     "PGH", # pygrep-hooks
     "PIE", # flake8-pie
     "PL", # Pylint
-    "RET", # flake8-return
     "RSE", # flake8-raise
     "RUF", # Ruff-specific and unused-noqa
     "S", # flake8-bandit
@@ -200,17 +195,15 @@ ignore = [
     "A002", # builtin-argument-shadowing
     "A004", # builtin-import-shadowing
     "F403", # `from . import *` used; unable to detect undefined names
+    "PIE796", # Enum contains duplicate value
+    "PLC2701", # Private name import from external module # https://github.com/astral-sh/ruff/issues/15294 and https://github.com/astral-sh/ruff/issues/15295
+    "S105", # Possible hardcoded password assigned
+    "S106", # Possible hardcoded password assigned to argument
+    "S107", # Possible hardcoded password assigned to function default
     "S3", # Use of insecure ...
     # Most pep8-naming rules don't apply for third-party stubs like typeshed.
     # N811 to N814 could apply, but we often use them to disambiguate a name whilst making it look like a more common one
     "N8",
-    "PIE796", # Enum contains duplicate value # astral-sh/ruff#15132
-    "PLC2701", # Private name import from external module
-    "PLW1641", # Object does not implement __hash__ method
-    "S105", # Possible hardcoded password assigned
-    "S106", # Possible hardcoded password assigned to argument
-    "S107", # Possible hardcoded password assigned to function default
-    "S4", # Insecure and vulnerable libraries
     # Stubs can sometimes re-export entire modules.
     # Issues with using a star-imported name will be caught by type-checkers.
     "F405", # may be undefined, or defined from star imports

tests/pytype_test.py

@@ -228,7 +228,10 @@ def run_all_tests(*, files_to_test: Sequence[str], print_stderr: bool, dry_run:
     python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
     print("Testing files with pytype...")
     for i, f in enumerate(files_to_test):
-        stderr = None if dry_run else run_pytype(filename=f, python_version=python_version, missing_modules=missing_modules)
+        if dry_run:
+            stderr = None
+        else:
+            stderr = run_pytype(filename=f, python_version=python_version, missing_modules=missing_modules)
         if stderr:
             if print_stderr:
                 print(f"\n{stderr}")