Merge branch 'main' into Enable-Ruff-flake8-pie-(PIE)

Author: Avasam

.github/renovate.json .github/renovate.json5.github/renovate.json renamed to .github/renovate.json5

@@ -17,6 +17,16 @@
       "description": "Quarterly update of GitHub Action dependencies",
       "schedule": ["every 3 months on the first day of the month"]
     },
+    {
+      // This package rule disables updates for `actions/setup-python` Python versions:
+      // it's better to do these manually as there's often a reason why we can't use
+      // the latest Python version in CI for a specific job
+      groupName: "Python versions",
+      matchManagers: ["github-actions"],
+      matchPackageNames: ["python"],
+      description: "Disable PRs updating Python versions",
+      enabled: false,
+    },
     {
       "groupName": "most test/lint dependencies",
       "matchManagers": ["pip_requirements", "pre-commit"],

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3 # must match requirements-tests.txt
+    rev: v0.11.2 # must match requirements-tests.txt
     hooks:
       - id: ruff
         name: Run ruff on stubs, tests and scripts
@@ -31,7 +31,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.2
+    rev: 7.2.0
     hooks:
       - id: flake8
         language: python

lib/ts_utils/paths.py

@@ -5,7 +5,7 @@
 # installed into the user's virtual env, so we can't determine the path
 # to typeshed. Installing ts_utils editable would solve that, see
 # https://github.com/python/typeshed/pull/12806.
-TS_BASE_PATH: Final = Path("")
+TS_BASE_PATH: Final = Path()
 STDLIB_PATH: Final = TS_BASE_PATH / "stdlib"
 STUBS_PATH: Final = TS_BASE_PATH / "stubs"
 

lib/ts_utils/utils.py

@@ -123,11 +123,11 @@ def parse_stdlib_versions_file() -> SupportedVersionsDict:
     result: dict[str, tuple[VersionTuple, VersionTuple]] = {}
     with VERSIONS_PATH.open(encoding="UTF-8") as f:
         for line in f:
-            line = strip_comments(line)
-            if line == "":
+            stripped_line = strip_comments(line)
+            if stripped_line == "":
                 continue
-            m = VERSION_LINE_RE.match(line)
-            assert m, f"invalid VERSIONS line: {line}"
+            m = VERSION_LINE_RE.match(stripped_line)
+            assert m, f"invalid VERSIONS line: {stripped_line}"
             mod: str = m.group(1)
             assert mod not in result, f"Duplicate module {mod} in VERSIONS"
             min_version = _parse_version(m.group(2))

pyproject.toml

@@ -54,9 +54,7 @@ select = [
     "N", # pep8-naming
     "PGH", # pygrep-hooks
     "PIE", # flake8-pie
-    "PLC", # Pylint Convention
-    "PLE", # Pylint Error
-    "PLR", # Pylint Refactor
+    "PL", # Pylint
     "RUF", # Ruff-specific and unused-noqa
     "TRY", # tryceratops
     "UP", # pyupgrade
@@ -77,6 +75,9 @@ select = [
     "FURB169", # Compare the identities of `{object}` and None instead of their respective types
     "FURB177", # Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups
     "FURB187", # Use of assignment of `reversed` on list `{name}`
+    # Autofixable flake8-use-pathlib only
+    "PTH201", # Do not pass the current directory explicitly to `Path`
+    "PTH210", # Invalid suffix passed to `.with_suffix()`
     # PYI: only enable rules that have autofixes and that we always want to fix (even manually),
     # avoids duplicate # noqa with flake8-pyi
     "PYI009", # Empty body should contain `...`, not pass
@@ -184,15 +185,19 @@ ignore = [
     # Rules that are out of the control of stub authors:
     ###
     # Names in stubs should match the implementation, even if it's ambiguous.
+    # https://github.com/astral-sh/ruff/issues/15293
     "A", # flake8-builtins
-    "F403", # `from . import *` used; unable to detect undefined names
     # Stubs can sometimes re-export entire modules.
     # Issues with using a star-imported name will be caught by type-checkers.
+    "F403", # `from . import *` used; unable to detect undefined names
     "F405", # may be undefined, or defined from star imports
     # 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", # pep8-naming
+    # Stubs are allowed to use private variables (pyright's reportPrivateUsage is also disabled)
     "PLC2701", # Private name import from external module
+    # Names in stubs should match implementation
+    "PLW0211", # First argument of a static method should not be named `{argument_name}`
 ]
 "lib/ts_utils/**" = [
     # Doesn't affect stubs. The only re-exports we have should be in our local lib ts_utils

pyrightconfig.stricter.json

@@ -49,7 +49,6 @@
         "stubs/httplib2",
         "stubs/hvac",
         "stubs/icalendar",
-        "stubs/influxdb-client",
         "stubs/jmespath",
         "stubs/jsonschema",
         "stubs/jwcrypto",

requirements-tests.txt

@@ -6,20 +6,20 @@ pyright==1.1.398
 pytype==2024.10.11; platform_system != "Windows" and python_version >= "3.10" and python_version < "3.13"
 
 # Libraries used by our various scripts.
-aiohttp==3.10.11
+aiohttp==3.11.15
 grpcio-tools>=1.66.2 # For grpc_tools.protoc
 mypy-protobuf==3.6.0
 packaging==24.2
 pathspec>=0.11.1
 pre-commit
 # Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
-ruff==0.9.3
+ruff==0.11.2
 stubdefaulter==0.1.0
 termcolor>=2.3
 tomli==2.2.1
 tomlkit==0.13.2
 typing_extensions>=4.13.0rc1
-uv==0.5.14
+uv==0.6.11
 
 # Utilities for typeshed infrastructure scripts.
 ts_utils @ file:lib

scripts/create_baseline_stubs.py

@@ -59,17 +59,17 @@ def run_stubgen(package: str, output: str) -> None:
 
 def run_stubdefaulter(stub_dir: str) -> None:
     print(f"Running stubdefaulter: stubdefaulter --packages {stub_dir}")
-    subprocess.run(["stubdefaulter", "--packages", stub_dir])
+    subprocess.run(["stubdefaulter", "--packages", stub_dir], check=False)
 
 
 def run_black(stub_dir: str) -> None:
     print(f"Running Black: black {stub_dir}")
-    subprocess.run(["pre-commit", "run", "black", "--files", *glob.iglob(f"{stub_dir}/**/*.pyi")])
+    subprocess.run(["pre-commit", "run", "black", "--files", *glob.iglob(f"{stub_dir}/**/*.pyi")], check=False)
 
 
 def run_ruff(stub_dir: str) -> None:
     print(f"Running Ruff: ruff check {stub_dir} --fix-only")
-    subprocess.run([sys.executable, "-m", "ruff", "check", stub_dir, "--fix-only"])
+    subprocess.run([sys.executable, "-m", "ruff", "check", stub_dir, "--fix-only"], check=False)
 
 
 async def get_project_urls_from_pypi(project: str, session: aiohttp.ClientSession) -> dict[str, str]:
@@ -102,9 +102,9 @@ async def get_upstream_repo_url(project: str) -> str | None:
             url for url_name, url in project_urls.items() if url_name not in url_names_probably_pointing_to_source
         )
 
-        for url in urls_to_check:
+        for url_to_check in urls_to_check:
             # Remove `www.`; replace `http://` with `https://`
-            url = re.sub(r"^(https?://)?(www\.)?", "https://", url)
+            url = re.sub(r"^(https?://)?(www\.)?", "https://", url_to_check)
             netloc = urllib.parse.urlparse(url).netloc
             if netloc in {"gitlab.com", "github.com", "bitbucket.org", "foss.heptapod.net"}:
                 # truncate to https://site.com/user/repo

scripts/stubsabot.py

@@ -754,8 +754,8 @@ async def main() -> None:
         dists_to_update = [path.name for path in STUBS_PATH.iterdir()]
 
     if args.action_level > ActionLevel.nothing:
-        subprocess.run(["git", "update-index", "--refresh"], capture_output=True)
-        diff_result = subprocess.run(["git", "diff-index", "HEAD", "--name-only"], text=True, capture_output=True)
+        subprocess.run(["git", "update-index", "--refresh"], capture_output=True, check=False)
+        diff_result = subprocess.run(["git", "diff-index", "HEAD", "--name-only"], text=True, capture_output=True, check=False)
         if diff_result.returncode:
             print("Unexpected exception!")
             print(diff_result.stdout)

scripts/sync_protobuf/_utils.py

@@ -35,7 +35,9 @@ def run_protoc(
 ) -> str:
     """TODO: Describe parameters and return."""
     protoc_version = (
-        subprocess.run([sys.executable, "-m", "grpc_tools.protoc", "--version"], capture_output=True).stdout.decode().strip()
+        subprocess.run([sys.executable, "-m", "grpc_tools.protoc", "--version"], capture_output=True, check=False)
+        .stdout.decode()
+        .strip()
     )
     print()
     print(protoc_version)