Merge branch 'main' into cysqlite

Author: Vizonex

stdlib/tkinter/__init__.pyi

@@ -1153,7 +1153,9 @@ class Grid:
         ipady: float | str = ...,
         padx: float | str | tuple[float | str, float | str] = ...,
         pady: float | str | tuple[float | str, float | str] = ...,
-        sticky: str = ...,  # consists of letters 'n', 's', 'w', 'e', may contain repeats, may be empty
+        sticky: (
+            str | list[str] | tuple[str, ...]
+        ) = ...,  # consists of letters 'n', 's', 'w', 'e', may contain repeats, may be empty
         in_: Misc = ...,
         **kw: Any,  # allow keyword argument named 'in', see #4836
     ) -> None: ...

stubs/cffi/METADATA.toml

@@ -1,4 +1,4 @@
-version = "1.17.*"
+version = "2.0.*"
 upstream_repository = "https://github.com/python-cffi/cffi/"
 requires = ["types-setuptools"]