Merge branch 'main' into renovate/pytype-and-pyright

Author: Avasam

MAINTAINERS.md

@@ -77,7 +77,13 @@ blocker is, usually with a link to an open issue in another project.
 We want to maintain a welcoming atmosphere for contributors, so use a friendly
 message when closing the PR. Example message:
 
-    Thanks for contributing! I'm closing this PR for now, because it still
-    <fails some tests OR has unresolved review feedback OR has a merge conflict>
-    after three months of inactivity. If you are still interested, please feel free to open
-    a new PR (or ping us to reopen this one).
+    Thanks for contributing! I'm closing this PR for now, because it still <fails some tests OR has unresolved review feedback OR has a merge conflict> after three months of inactivity. If you are still interested, please feel free to open a new PR (or ping us to reopen this one).
+
+### Closing PRs for future standard library changes
+
+*See also the [guidelines in the CONTRIBUTING file](./CONTRIBUTING.md#standard-library-stubs).*
+
+When rejecting a PR for a change for a future Python version, use a message
+like:
+
+    Thanks for contributing! Unfortunately, [as outlined in our CONTRIBUTING document](https://github.com/python/typeshed/blob/main/CONTRIBUTING.md#standard-library-stubs) we only accept pull requests to the standard library for future Python versions after the first beta version has been released. This is in part to prevent churn in the stubs, and in part because the testing infrastructure for the future version is not yet in place. Please feel free to open a new PR when the first beta version has been released. Alternatively, if this PR is still relevant, you can leave a comment here to reopen it.

pyrightconfig.stricter.json

@@ -34,7 +34,6 @@
         "stubs/cffi",
         "stubs/click-default-group",
         "stubs/click-web",
-        "stubs/commonmark",
         "stubs/corus",
         "stubs/dateparser",
         "stubs/defusedxml",

scripts/create_baseline_stubs.py

@@ -46,6 +46,8 @@ def get_installed_package_info(project: str) -> tuple[str, str] | None:
 
     Return (normalized project name, installed version) if successful.
     """
+    # Not using "uv pip freeze" because if this is run from a global Python,
+    # it'll mistakenly list the .venv's packages.
     r = subprocess.run(["pip", "freeze"], capture_output=True, text=True, check=True)
     return search_pip_freeze_output(project, r.stdout)
 
@@ -220,7 +222,7 @@ def main() -> None:
     if info is None:
         print(f'Error: "{project}" is not installed', file=sys.stderr)
         print(file=sys.stderr)
-        print(f'Suggestion: Run "python3 -m pip install {project}" and try again', file=sys.stderr)
+        print(f"Suggestion: Run `{sys.executable} -m pip install {project}` and try again", file=sys.stderr)
         sys.exit(1)
     project, version = info
 

scripts/install_all_third_party_dependencies.py

@@ -3,11 +3,13 @@
 
 from ts_utils.requirements import get_external_stub_requirements
 
-use_uv = "--uv" in sys.argv
-if use_uv:
-    pip_command = ["uv", "pip", "install"]
-else:
-    pip_command = ["pip", "install"]
-
-requirements = get_external_stub_requirements()
-subprocess.check_call(pip_command + [str(requirement) for requirement in requirements])
+
+def main() -> None:
+    requirements = get_external_stub_requirements()
+    # By forwarding arguments, we naturally allow non-venv (system installs)
+    # by letting the script's user follow uv's own helpful hint of passing the `--system` flag.
+    subprocess.check_call(["uv", "pip", "install", *sys.argv[1:], *[str(requirement) for requirement in requirements]])
+
+
+if __name__ == "__main__":
+    main()

stubs/JACK-Client/METADATA.toml

@@ -5,8 +5,8 @@ requires = ["numpy>=1.20", "types-cffi"]
 
 [tool.stubtest]
 # darwin and win32 are equivalent
-platforms = ["linux"]
+platforms = ["darwin", "linux"]
 apt_dependencies = ["libjack-dev"]
-# brew_dependencies = ["jack"]
+brew_dependencies = ["jack"]
 # No need to install on the CI. Leaving here as information for Windows contributors.
 # choco_dependencies = ["jack"]

stubs/commonmark/@tests/stubtest_allowlist.txt

@@ -0,0 +1,2 @@
+# Testing modules are not included in type stubs
+commonmark.tests.*

stubs/commonmark/METADATA.toml

@@ -1,6 +1,2 @@
 version = "0.9.*"
 upstream_repository = "https://github.com/rtfd/commonmark.py"
-partial_stub = true
-
-[tool.stubtest]
-ignore_missing_stub = true

stubs/commonmark/commonmark/entitytrans.pyi

@@ -1 +1,3 @@
 def _unescape(s: str) -> str: ...
+
+__all__ = ["_unescape"]

stubs/commonmark/commonmark/inlines.pyi

@@ -50,14 +50,14 @@ class InlineParser:
     def removeDelimiter(self, delim: dict[str, Any]) -> None: ...
     @staticmethod
     def removeDelimitersBetween(bottom: dict[str, Any], top: dict[str, Any]) -> None: ...
-    def processEmphasis(self, stack_bottom) -> None: ...
+    def processEmphasis(self, stack_bottom: dict[str, Any]) -> None: ...
     def parseLinkTitle(self) -> str | None: ...
     def parseLinkDestination(self) -> str | None: ...
     def parseLinkLabel(self) -> int: ...
     def parseOpenBracket(self, block: Node) -> Literal[True]: ...
     def parseBang(self, block: Node) -> Literal[True]: ...
     def parseCloseBracket(self, block: Node) -> Literal[True]: ...
-    def addBracket(self, node, index, image) -> None: ...
+    def addBracket(self, node: Node, index: int, image: bool | None) -> None: ...
     def removeBracket(self) -> None: ...
     def parseEntity(self, block: Node) -> bool: ...
     def parseString(self, block: Node) -> bool: ...

stubs/commonmark/commonmark/normalize_reference.pyi

@@ -1 +1,3 @@
 def normalize_reference(string: str) -> str: ...
+
+__all__ = ["normalize_reference"]