Merge branch 'python:master' into master

Author: KotlinIsland

.github/workflows/daily.yml

@@ -25,9 +25,9 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Update pip
@@ -46,8 +46,8 @@ jobs:
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -68,7 +68,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/mypy_primer.yml

@@ -21,11 +21,11 @@ jobs:
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: typeshed_to_test
           fetch-depth: 0
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -54,7 +54,7 @@ jobs:
             | tee diff_${{ matrix.shard-index }}.txt
           ) || [ $? -eq 1 ]
       - name: Upload mypy_primer diff
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: mypy_primer_diffs
           path: diff_${{ matrix.shard-index }}.txt
@@ -64,7 +64,7 @@ jobs:
           echo ${{ github.event.pull_request.number }} | tee pr_number.txt
       - if: ${{ matrix.shard-index }} == 0
         name: Upload PR number
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: mypy_primer_diffs
           path: pr_number.txt

.github/workflows/mypy_primer_comment.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download diffs
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           script: |
             const fs = require('fs');
@@ -43,7 +43,7 @@ jobs:
 
       - name: Post comment
         id: post-comment
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/stubtest_stdlib.yml

@@ -31,9 +31,9 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Update pip

.github/workflows/tests.yml

@@ -21,34 +21,40 @@ jobs:
     name: Check file consistency
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
       - run: pip install $(grep tomli== requirements-tests.txt)
       - run: ./tests/check_consistent.py
 
   new-syntax:
     name: Ensure new syntax usage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
       - run: ./tests/check_new_syntax.py
 
   flake8:
     name: Lint with flake8
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
       - run: pip install $(grep flake8 requirements-tests.txt)
       - run: flake8
 
   pytype:
     name: Run pytype against the stubs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - run: pip install -r requirements-tests.txt
@@ -63,8 +69,10 @@ jobs:
         python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
       - run: pip install $(grep tomli== requirements-tests.txt) $(grep mypy== requirements-tests.txt) termcolor
       - run: ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }}
 
@@ -79,7 +87,7 @@ jobs:
     env:
       PYRIGHT_VERSION: 1.1.255 # Must match pyright_test.py.
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: jakebailey/pyright-action@v1
         with:
           version: ${{ env.PYRIGHT_VERSION }}
@@ -99,10 +107,10 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.9
       - name: Install dependencies

requirements-tests.txt

@@ -1,5 +1,5 @@
 mypy==0.960
-pytype==2022.6.6; platform_system != "Windows"
+pytype==2022.6.23; platform_system != "Windows"
 # must match .pre-commit-config.yaml
 black==22.3.0
 # must match .pre-commit-config.yaml

scripts/create_baseline_stubs.py

@@ -139,9 +139,11 @@ def main() -> None:
         # The importlib.metadata module is used for projects whose name is different
         # from the runtime Python package name (example: PyYAML/yaml)
         if sys.version_info >= (3, 8):
-            packages = [name for name in distribution(project).read_text("top_level.txt").split() if not name.startswith("_")]
-            if len(packages) == 1:
-                package = packages[0]
+            dist = distribution(project).read_text("top_level.txt")
+            if dist is not None:
+                packages = [name for name in dist.split() if not name.startswith("_")]
+                if len(packages) == 1:
+                    package = packages[0]
         print(f'Using detected package "{package}" for project "{project}"', file=sys.stderr)
         print("Suggestion: Try again with --package argument if that's not what you wanted", file=sys.stderr)
 

scripts/stubsabot.py

@@ -16,17 +16,19 @@
 import zipfile
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any
+from typing import Any, TypeVar
 
 import aiohttp
 import packaging.specifiers
 import packaging.version
 import tomli
 import tomlkit
 
+ActionLevelSelf = TypeVar("ActionLevelSelf", bound="ActionLevel")
+
 
 class ActionLevel(enum.IntEnum):
-    def __new__(cls, value: int, doc: str):
+    def __new__(cls: type[ActionLevelSelf], value: int, doc: str) -> ActionLevelSelf:
         member = int.__new__(cls, value)
         member._value_ = value
         member.__doc__ = doc
@@ -64,6 +66,7 @@ class PypiInfo:
     # https://warehouse.pypa.io/api-reference/json.html#get--pypi--project_name--json
     # Corresponds to a single entry from `releases` for the given version
     release_to_download: dict[str, Any]
+    info: dict[str, Any]
 
 
 async def fetch_pypi_info(distribution: str, session: aiohttp.ClientSession) -> PypiInfo:
@@ -80,6 +83,7 @@ async def fetch_pypi_info(distribution: str, session: aiohttp.ClientSession) ->
             version=packaging.version.Version(version),
             upload_date=date,
             release_to_download=release_to_download,
+            info=j["info"],
         )
 
 
@@ -89,6 +93,7 @@ class Update:
     stub_path: Path
     old_version_spec: str
     new_version_spec: str
+    links: dict[str, str]
 
     def __str__(self) -> str:
         return f"Updating {self.distribution} from {self.old_version_spec!r} to {self.new_version_spec!r}"
@@ -100,6 +105,7 @@ class Obsolete:
     stub_path: Path
     obsolete_since_version: str
     obsolete_since_date: datetime.datetime
+    links: dict[str, str]
 
     def __str__(self) -> str:
         return f"Marking {self.distribution} as obsolete since {self.obsolete_since_version!r}"
@@ -171,35 +177,45 @@ async def determine_action(stub_path: Path, session: aiohttp.ClientSession) -> U
     if pypi_info.version in spec:
         return NoUpdate(stub_info.distribution, "up to date")
 
+    project_urls = pypi_info.info["project_urls"] or {}
+    maybe_links: dict[str, str | None] = {
+        "Release": pypi_info.info["release_url"],
+        "Homepage": project_urls.get("Homepage"),
+        "Changelog": project_urls.get("Changelog") or project_urls.get("Changes") or project_urls.get("Change Log"),
+    }
+    links = {k: v for k, v in maybe_links.items() if v is not None}
+
     if await package_contains_py_typed(pypi_info.release_to_download, session):
         return Obsolete(
             stub_info.distribution,
             stub_path,
             obsolete_since_version=str(pypi_info.version),
             obsolete_since_date=pypi_info.upload_date,
+            links=links,
         )
 
     return Update(
         distribution=stub_info.distribution,
         stub_path=stub_path,
         old_version_spec=stub_info.version_spec,
         new_version_spec=get_updated_version_spec(stub_info.version_spec, pypi_info.version),
+        links=links,
     )
 
 
 TYPESHED_OWNER = "python"
 
 
 @functools.lru_cache()
-def get_origin_owner():
+def get_origin_owner() -> str:
     output = subprocess.check_output(["git", "remote", "get-url", "origin"], text=True)
     match = re.search(r"([email protected]:|https://github.com/)(?P<owner>[^/]+)/(?P<repo>[^/]+).git", output)
     assert match is not None
     assert match.group("repo") == "typeshed"
     return match.group("owner")
 
 
-async def create_or_update_pull_request(*, title: str, body: str, branch_name: str, session: aiohttp.ClientSession):
+async def create_or_update_pull_request(*, title: str, body: str, branch_name: str, session: aiohttp.ClientSession) -> None:
     secret = os.environ["GITHUB_TOKEN"]
     if secret.startswith("ghp"):
         auth = f"token {secret}"
@@ -266,7 +282,9 @@ async def suggest_typeshed_update(update: Update, session: aiohttp.ClientSession
             return
         subprocess.check_call(["git", "push", "origin", branch_name, "--force-with-lease"])
 
-    body = """\
+    body = "\n".join(f"{k}: {v}" for k, v in update.links.items())
+    body += """
+
 If stubtest fails for this PR:
 - Leave this PR open (as a reminder, and to prevent stubsabot from opening another PR)
 - Fix stubtest failures in another PR, then close this PR
@@ -293,7 +311,8 @@ async def suggest_typeshed_obsolete(obsolete: Obsolete, session: aiohttp.ClientS
             return
         subprocess.check_call(["git", "push", "origin", branch_name, "--force-with-lease"])
 
-    await create_or_update_pull_request(title=title, body="", branch_name=branch_name, session=session)
+    body = "\n".join(f"{k}: {v}" for k, v in obsolete.links.items())
+    await create_or_update_pull_request(title=title, body=body, branch_name=branch_name, session=session)
 
 
 async def main() -> None:

stdlib/@python2/itertools.pyi

@@ -22,7 +22,10 @@ class chain(Iterator[_T], Generic[_T]):
 
 def compress(data: Iterable[_T], selectors: Iterable[Any]) -> Iterator[_T]: ...
 def dropwhile(predicate: Callable[[_T], Any], iterable: Iterable[_T]) -> Iterator[_T]: ...
-def ifilter(predicate: Callable[[_T], Any] | None, iterable: Iterable[_T]) -> Iterator[_T]: ...
+@overload
+def ifilter(predicate: None, iterable: Iterable[_T | None]) -> Iterator[_T]: ...
+@overload
+def ifilter(predicate: Callable[[_T], Any], iterable: Iterable[_T]) -> Iterator[_T]: ...
 def ifilterfalse(predicate: Callable[[_T], Any] | None, iterable: Iterable[_T]) -> Iterator[_T]: ...
 @overload
 def groupby(iterable: Iterable[_T], key: None = ...) -> Iterator[tuple[_T, Iterator[_T]]]: ...

stdlib/_decimal.pyi

@@ -3,7 +3,7 @@ import sys
 from _typeshed import Self
 from collections.abc import Container, Sequence
 from types import TracebackType
-from typing import Any, NamedTuple, Union, overload
+from typing import Any, ClassVar, NamedTuple, Union, overload
 from typing_extensions import TypeAlias
 
 _Decimal: TypeAlias = Decimal | int
@@ -209,7 +209,8 @@ class Context:
     def clear_traps(self) -> None: ...
     def copy(self) -> Context: ...
     def __copy__(self) -> Context: ...
-    __hash__: Any
+    # see https://github.com/python/cpython/issues/94107
+    __hash__: ClassVar[None]  # type: ignore[assignment]
     def Etiny(self) -> int: ...
     def Etop(self) -> int: ...
     def create_decimal(self, __num: _DecimalNew = ...) -> Decimal: ...

stdlib/_dummy_threading.pyi

@@ -1,13 +1,9 @@
 import sys
+from _typeshed import ProfileFunction, TraceFunction
 from collections.abc import Callable, Iterable, Mapping
-from types import FrameType, TracebackType
+from types import TracebackType
 from typing import Any, TypeVar
-from typing_extensions import TypeAlias
 
-# TODO recursive type
-_TF: TypeAlias = Callable[[FrameType, str, Any], Callable[..., Any] | None]
-
-_PF: TypeAlias = Callable[[FrameType, str, Any], None]
 _T = TypeVar("_T")
 
 __all__ = [
@@ -43,8 +39,8 @@ def currentThread() -> Thread: ...
 def get_ident() -> int: ...
 def enumerate() -> list[Thread]: ...
 def main_thread() -> Thread: ...
-def settrace(func: _TF) -> None: ...
-def setprofile(func: _PF | None) -> None: ...
+def settrace(func: TraceFunction) -> None: ...
+def setprofile(func: ProfileFunction | None) -> None: ...
 def stack_size(size: int = ...) -> int: ...
 
 TIMEOUT_MAX: float