Merge branch 'main' into Fix-all-stub-body-multiple-statements-(PYI048)

Author: debonte

pyproject.toml

@@ -125,13 +125,10 @@ disable_error_code = [
     # Not all imports in these stubs are gonna be typed
     "import-untyped",
     # TODO
-    "assert-type",
-    "assignment",
-    "attr-defined",
-    "misc",
-    "no-redef",
-    "override",
-    "return",
-    "valid-type",
-    "var-annotated",
+    "valid-type", # 967 errors in 115 files
+    "override", # 790 errors in 220 files
+    "assignment", # 773 errors in 172 files
+    "misc", # 692 errors in 132 files
+    "attr-defined", # 202 errors in 75 files
+    "assert-type", # 6 errors in 1 file
 ]

stubs/matplotlib/ft2font.pyi

@@ -1,7 +1,6 @@
 # Python: 3.8.8 (tags/v3.8.8:024d805, Feb 19 2021, 13:18:16) [MSC v.1928 64 bit (AMD64)]
 # Library: matplotlib, version: 3.4.0
 # Module: matplotlib.ft2font, version: unspecified
-import builtins as _mod_builtins
 import typing
 
 BOLD: int
@@ -123,11 +122,7 @@ MULTIPLE_MASTERS: int
 SCALABLE: int
 SFNT: int
 VERTICAL: int
-__doc__: typing.Any
-__file__: str
 __freetype_build_type__: str
 __freetype_version__: str
-__name__: str
-__package__: str
 
 def __getattr__(name) -> typing.Any: ...

stubs/networkx/classes/ordered.pyi

@@ -6,7 +6,7 @@ from .graph import Graph
 from .multidigraph import MultiDiGraph
 from .multigraph import MultiGraph
 
-__all__ = []
+__all__: list[str] = []
 
 class OrderedGraph(Graph):
     node_dict_factory = ...

stubs/vispy/ext/cocoapy.pyi

@@ -364,8 +364,6 @@ kCGImageAlphaNoneSkipLast: int = ...
 kCGImageAlphaNoneSkipFirst: int = ...
 kCGImageAlphaOnly: int = ...
 
-kCGImageAlphaPremultipliedLast: int = ...
-
 kCGBitmapAlphaInfoMask: int = ...
 kCGBitmapFloatComponents = ...