Merge branch 'main' into with_3_overloads

Author: randolf-scholz

CONTRIBUTING.md

@@ -344,20 +344,20 @@ the latest mypy (`pip install -r requirements-tests.txt`) before running the scr
 
 ### Supported type system features
 
-Since PEP 484 was accepted, there have been many other PEPs that added
-new features to the Python type system. In general, new features can
-be used in typeshed as soon as the PEP has been accepted and implemented
-and most type checkers support the new feature.
+Since [PEP 484](https://peps.python.org/pep-0484/) was accepted, there have been
+many other PEPs that added new features to the Python type system. In general,
+new features can be used in typeshed as soon as the PEP has been accepted and
+implemented and most type checkers support the new feature.
 
 Supported features include:
-- [PEP 544](https://peps.python.org/pep-0544/) (Protocol)
+- [PEP 544](https://peps.python.org/pep-0544/) (`Protocol`)
 - [PEP 585](https://peps.python.org/pep-0585/) (builtin generics)
-- [PEP 586](https://peps.python.org/pep-0586/) (Literal)
-- [PEP 591](https://peps.python.org/pep-0591/) (Final/@final)
-- [PEP 589](https://peps.python.org/pep-0589/) (TypedDict)
+- [PEP 586](https://peps.python.org/pep-0586/) (`Literal`)
+- [PEP 591](https://peps.python.org/pep-0591/) (`Final`/`@final`)
+- [PEP 589](https://peps.python.org/pep-0589/) (`TypedDict`)
 - [PEP 604](https://peps.python.org/pep-0604/) (`Foo | Bar` union syntax)
-- [PEP 612](https://peps.python.org/pep-0612/) (ParamSpec)
-- [PEP 647](https://peps.python.org/pep-0647/) (TypeGuard):
+- [PEP 612](https://peps.python.org/pep-0612/) (`ParamSpec`)
+- [PEP 647](https://peps.python.org/pep-0647/) (`TypeGuard`):
   see [#5406](https://github.com/python/typeshed/issues/5406)
 - [PEP 655](https://peps.python.org/pep-0655/) (`Required` and `NotRequired`)
 - [PEP 673](https://peps.python.org/pep-0673/) (`Self`)

stdlib/@tests/stubtest_allowlists/linux.txt

@@ -27,6 +27,15 @@ fcntl.I_[A-Z0-9_]+  # Platform differences that cannot be captured by the type s
 multiprocessing.popen_spawn_win32  # exists on Linux but fails to import
 select.poll  # Actually a function; we have a class so it can be used as a type
 
+# Bluetooth constants which aren't on the GitHub Actions runners, see #15207
+(_?socket\.AF_BLUETOOTH)?
+(_?socket\.BDADDR_ANY)?
+(_?socket\.BDADDR_LOCAL)?
+(_?socket\.BTPROTO_HCI)?
+(_?socket\.BTPROTO_L2CAP)?
+(_?socket\.BTPROTO_RFCOMM)?
+(_?socket\.BTPROTO_SCO)?
+
 # These seem like they should be available on Linux, but they're not
 # on GitHub Actions runners for some reason.
 _?socket.IPX_TYPE

stdlib/_socket.pyi

@@ -587,7 +587,7 @@ if sys.platform != "linux":
 
 has_ipv6: bool
 
-if sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "darwin":
     BDADDR_ANY: Final = "00:00:00:00:00:00"
     BDADDR_LOCAL: Final = "00:00:00:FF:FF:FF"
 
@@ -660,16 +660,16 @@ if sys.platform == "darwin":
     PF_SYSTEM: Final[int]
     SYSPROTO_CONTROL: Final[int]
 
-if sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "darwin":
     AF_BLUETOOTH: Final[int]
 
-if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "win32" and sys.platform != "darwin":
     # Linux and some BSD support is explicit in the docs
     # Windows and macOS do not support in practice
     BTPROTO_HCI: Final[int]
     BTPROTO_L2CAP: Final[int]
     BTPROTO_SCO: Final[int]  # not in FreeBSD
-if sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "darwin":
     BTPROTO_RFCOMM: Final[int]
 
 if sys.platform == "linux":

stdlib/socket.pyi

@@ -519,9 +519,10 @@ if sys.platform != "win32":
 
         __all__ += ["SO_BINDTODEVICE"]
 
-if sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "darwin":
     from _socket import BDADDR_ANY as BDADDR_ANY, BDADDR_LOCAL as BDADDR_LOCAL, BTPROTO_RFCOMM as BTPROTO_RFCOMM
 
+if sys.platform != "darwin" and sys.platform != "linux":
     __all__ += ["BDADDR_ANY", "BDADDR_LOCAL", "BTPROTO_RFCOMM"]
 
 if sys.platform == "darwin" and sys.version_info >= (3, 10):
@@ -969,9 +970,10 @@ if sys.platform != "linux":
 if sys.platform != "darwin" and sys.platform != "linux":
     __all__ += ["AF_BLUETOOTH"]
 
-if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "win32" and sys.platform != "darwin":
     from _socket import BTPROTO_HCI as BTPROTO_HCI, BTPROTO_L2CAP as BTPROTO_L2CAP, BTPROTO_SCO as BTPROTO_SCO
 
+if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
     __all__ += ["BTPROTO_HCI", "BTPROTO_L2CAP", "BTPROTO_SCO"]
 
 if sys.platform != "win32" and sys.platform != "darwin" and sys.platform != "linux":
@@ -1131,7 +1133,7 @@ class AddressFamily(IntEnum):
         AF_QIPCRTR = 42
     if sys.platform != "linux":
         AF_LINK = 33
-    if sys.platform != "darwin" and sys.platform != "linux":
+    if sys.platform != "darwin":
         AF_BLUETOOTH = 32
     if sys.platform == "win32" and sys.version_info >= (3, 12):
         AF_HYPERV = 34
@@ -1186,7 +1188,7 @@ if sys.platform == "linux":
 
 if sys.platform != "linux":
     AF_LINK: Final = AddressFamily.AF_LINK
-if sys.platform != "darwin" and sys.platform != "linux":
+if sys.platform != "darwin":
     AF_BLUETOOTH: Final = AddressFamily.AF_BLUETOOTH
 if sys.platform == "win32" and sys.version_info >= (3, 12):
     AF_HYPERV: Final = AddressFamily.AF_HYPERV

stubs/geopandas/geopandas/geodataframe.pyi

@@ -221,7 +221,7 @@ class GeoDataFrame(GeoPandasBase, pd.DataFrame):  # type: ignore[misc]
         self,
         path: str | os.PathLike[str] | SupportsWrite[Incomplete],
         index: bool | None = None,
-        compression: Literal["snappy", "gzip", "brotli"] | None = "snappy",
+        compression: Literal["snappy", "gzip", "brotli", "lz4", "zstd"] | None = "snappy",
         geometry_encoding: _GeomEncoding = "WKB",
         write_covering_bbox: bool = False,
         schema_version: str | None = None,

stubs/punq/punq/__init__.pyi

@@ -86,7 +86,7 @@ class Container:
         instance: _T | _Empty = ...,
         scope: Scope = Scope.transient,
         **kwargs: Any,
-    ): ...
+    ) -> Container: ...
     def resolve_all(self, service: type[_T] | str, **kwargs: Any) -> list[_T]: ...
     def resolve(self, service_key: type[_T] | str, **kwargs: Any) -> _T: ...
     def instantiate(self, service_key: type[_T] | str, **kwargs: Any) -> _T: ...

stubs/tensorflow/tensorflow/__init__.pyi

@@ -26,6 +26,7 @@ from tensorflow._aliases import (
     AnyArray,
     DTypeLike,
     IntArray,
+    RaggedTensorLike,
     ScalarTensorCompatible,
     ShapeLike,
     Slice,
@@ -448,4 +449,5 @@ def transpose(
 def clip_by_value(
     t: Tensor | IndexedSlices, clip_value_min: TensorCompatible, clip_value_max: TensorCompatible, name: str | None = None
 ) -> Tensor: ...
+def tile(input: RaggedTensorLike, multiples: Tensor, name: str | None = None) -> Tensor: ...
 def __getattr__(name: str): ...  # incomplete module

stubs/tensorflow/tensorflow/keras/layers/__init__.pyi

@@ -443,4 +443,48 @@ class GaussianDropout(Layer[tf.Tensor, tf.Tensor]):
         name: str | None = None,
     ) -> None: ...
 
+class Activation(Layer[tf.Tensor, tf.Tensor]):
+    def __init__(
+        self,
+        activation: _Activation = None,
+        *,
+        # **kwargs passed to Layer
+        # **kwargs passed to Layer
+        activity_regularizer: _Regularizer = None,
+        trainable: bool = True,
+        dtype: _LayerDtype | None = None,
+        autocast: bool = True,
+        name: str | None = None,
+    ) -> None: ...
+
+class GlobalAveragePooling2D(Layer[tf.Tensor, tf.Tensor]):
+    def __init__(
+        self,
+        data_format: Literal["channels_last", "channels_first"] | None = None,
+        keepdims: bool = False,
+        *,
+        # **kwargs passed to Layer
+        activity_regularizer: _Regularizer = None,
+        trainable: bool = True,
+        dtype: _LayerDtype | None = None,
+        autocast: bool = True,
+        name: str | None = None,
+    ) -> None: ...
+
+class MaxPool2D(Layer[tf.Tensor, tf.Tensor]):
+    def __init__(
+        self,
+        pool_size: int | tuple[int, int] = (2, 2),
+        strides: int | tuple[int, int] | None = None,
+        padding: Literal["valid", "same"] = "valid",
+        data_format: Literal["channels_last", "channels_first"] | None = None,
+        *,
+        # **kwargs passed to Layer
+        activity_regularizer: _Regularizer = None,
+        trainable: bool = True,
+        dtype: _LayerDtype | None = None,
+        autocast: bool = True,
+        name: str | None = None,
+    ) -> None: ...
+
 def __getattr__(name: str): ...  # incomplete module

tests/README.md

@@ -22,17 +22,17 @@ may require extra dependencies external to typeshed to be installed in your virt
 prior to running the test.
 You can list or install all of a stubs package's external dependencies using the following script:
 ```bash
-(.venv3)$ python tests/get_external_stub_requirements.py <third_party_stub>  # List external dependencies for <third_party_stub>
-(.venv3)$ python tests/get_external_stub_requirements.py <third_party_stub1> <third_party_stub2>  # List external dependencies for <third_party_stub1> and <third_party_stub2>
-(.venv3)$ python tests/get_external_stub_requirements.py  # List external dependencies for all third-party stubs in typeshed
-(.venv3)$ python scripts/install_all_third_party_dependencies.py  # Install external dependencies for all third-party stubs in typeshed
+(.venv)$ python tests/get_external_stub_requirements.py <third_party_stub>  # List external dependencies for <third_party_stub>
+(.venv)$ python tests/get_external_stub_requirements.py <third_party_stub1> <third_party_stub2>  # List external dependencies for <third_party_stub1> and <third_party_stub2>
+(.venv)$ python tests/get_external_stub_requirements.py  # List external dependencies for all third-party stubs in typeshed
+(.venv)$ python scripts/install_all_third_party_dependencies.py  # Install external dependencies for all third-party stubs in typeshed
 ```
 
 ## Run all tests for a specific stub
 
 Run using:
 ```bash
-(.venv3)$ python3 tests/runtests.py <stdlib-or-stubs>/<stub-to-test>
+(.venv)$ python3 tests/runtests.py <stdlib-or-stubs>/<stub-to-test>
 ```
 
 This script will run all tests below for a specific typeshed directory. If a
@@ -52,7 +52,7 @@ For more information, see the docs on [`stubtest_stdlib.py`](#stubtest_stdlibpy)
 
 Run using:
 ```bash
-(.venv3)$ python3 tests/mypy_test.py
+(.venv)$ python3 tests/mypy_test.py
 ```
 
 The test has two parts: running mypy on the stdlib stubs,
@@ -71,9 +71,9 @@ This test requires [Node.js](https://nodejs.org) to be installed. Although
 typeshed runs pyright in CI, it does not currently use this script. However,
 this script uses the same pyright version and configuration as the CI.
 ```bash
-(.venv3)$ python3 tests/pyright_test.py                                # Check all files
-(.venv3)$ python3 tests/pyright_test.py stdlib/sys.pyi                 # Check one file
-(.venv3)$ python3 tests/pyright_test.py -p pyrightconfig.stricter.json # Check with the stricter config.
+(.venv)$ python3 tests/pyright_test.py                                # Check all files
+(.venv)$ python3 tests/pyright_test.py stdlib/sys.pyi                 # Check one file
+(.venv)$ python3 tests/pyright_test.py -p pyrightconfig.stricter.json # Check with the stricter config.
 ```
 
 `pyrightconfig.stricter.json` is a stricter configuration that enables additional
@@ -103,7 +103,7 @@ $ python3 tests/check_typeshed_structure.py
 
 Run using
 ```bash
-(.venv3)$ python3 tests/stubtest_stdlib.py
+(.venv)$ python3 tests/stubtest_stdlib.py
 ```
 
 This test compares the stdlib stubs against the objects at runtime. Because of
@@ -138,21 +138,21 @@ stubtest on.
 
 Run using
 ```bash
-(.venv3)$ python3 tests/stubtest_third_party.py
+(.venv)$ python3 tests/stubtest_third_party.py
 ```
 
 Similar to `stubtest_stdlib.py`, but tests the third party stubs. By default,
 it checks all third-party stubs, but you can provide the distributions to
 check on the command line:
 
 ```bash
-(.venv3)$ python3 tests/stubtest_third_party.py requests toml  # check stubs/requests and stubs/toml
+(.venv)$ python3 tests/stubtest_third_party.py requests toml  # check stubs/requests and stubs/toml
 ```
 
 If you have the runtime package installed in your local virtual environment, you can also run stubtest
 directly, with
 ```bash
-(.venv3)$ MYPYPATH=<path-to-module-stubs> python3 -m mypy.stubtest \
+(.venv)$ MYPYPATH=<path-to-module-stubs> python3 -m mypy.stubtest \
   --custom-typeshed-dir <path-to-typeshed> \
   <third-party-module>
 ```
@@ -203,7 +203,7 @@ configuration to properly validate Django-specific types during stubtest executi
 
 Run using
 ```bash
-(.venv3)$ python3 tests/typecheck_typeshed.py
+(.venv)$ python3 tests/typecheck_typeshed.py
 ```
 
 This is a small wrapper script that uses mypy to typecheck typeshed's own code in the

tests/REGRESSION.md

@@ -99,8 +99,9 @@ rather than `.pyi` files)
 is that the test cases cannot always use modern syntax for type hints.
 While we can use `from __future__ import annotations` to enable the use of
 modern typing syntax wherever possible,
-type checkers may (correctly) emit errors if PEP 604 syntax or PEP 585 syntax
-is used in a runtime context on lower versions of Python. For example:
+type checkers may (correctly) emit errors if [PEP 604](https://peps.python.org/pep-0604/)
+syntax or [PEP 585](https://peps.python.org/pep-0585/) syntax is used
+in a runtime context on lower versions of Python. For example:
 
 ```python
 from __future__ import annotations