Merge branch 'main' into patch-4

Author: JelleZijlstra

.editorconfig

@@ -1,12 +1,16 @@
 root = true
 
-[*.{py,pyi,rst,md,yml,yaml,toml,json,txt}]
+[*]
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
+end_of_line = lf
+indent_size = 2
+
+[*.md]
+max_line_length = 79
+trim_trailing_whitespace = false
 
 [*.{py,pyi,toml,json}]
+max_line_length = 130
 indent_size = 4
-
-[*.{yml,yaml}]
-indent_size = 2

.flake8

@@ -8,16 +8,16 @@
 #     RST    flake8-rst-docstrings
 #     TYP    flake8-typing-imports
 
-# The following rules are incompatible with or enforced by black:
+# The following rules are incompatible with or enforced by Black:
 #     E203   whitespace before ':' -- scripts only
 #     E301   expected 1 blank line
 #     E302   expected 2 blank lines
 #     E305   expected 2 blank lines
 #     E501   line too long
+#     E701   Multiple statements on one line (colon) -- disallows "..." on the same line
 
 # Some rules are considered irrelevant to stub files:
 #     B      All flake8-bugbear rules are .py-specific
-#     E701   multiple statements on one line (colon) -- disallows "..." on the same line
 #     F401   imported but unused -- does not recognize re-exports
 #            https://github.com/PyCQA/pyflakes/issues/474
 
@@ -27,19 +27,18 @@
 #     F405   defined from star imports
 
 [flake8]
-extend-ignore = A, D, N8, SIM, RST, TYP, E301, E302, E305, E501
+extend-ignore = A, D, N8, SIM, RST, TYP, E301, E302, E305, E501, E701
 per-file-ignores =
   *.py: E203
-  *.pyi: B, E701, E741, F401, F403, F405
-  # Since typing.pyi defines "overload" this is not recognized by flake8 as typing.overload.
-  # Unfortunately, flake8 does not allow to "noqa" just a specific error inside the file itself.
+  *.pyi: B, E741, F401, F403, F405
+  # Since typing.pyi defines "overload" this is not recognized by Flake8 as typing.overload.
+  # Unfortunately, Flake8 does not allow to "noqa" just a specific error inside the file itself.
   # https://github.com/PyCQA/flake8/issues/1079
   #     F811 redefinition of unused '...'
-  stdlib/typing.pyi: B, E701, E741, F401, F403, F405, F811
-  # Generated protobuf files include docstrings
-  # *_pb2.pyi: B, E701, E741, F401, F403, F405, Y021, Y026, Y053, Y054
+  stdlib/typing.pyi: B, E741, F401, F403, F405, F811
+  # Generated protobuf files include docstrings,
+  # and import some things from typing_extensions that could be imported from typing
+  *_pb2.pyi: B, E741, F401, F403, F405, Y021, Y023, Y026, Y053, Y054
 
-# TODO: Re-enable flake8 on generated protobuf files
-# after https://github.com/nipunn1313/mypy-protobuf/issues/523 is resolved
-exclude = .venv*,.git,*_pb2.pyi
+exclude = .venv*,.git
 noqa_require_code = true

.gitattributes

@@ -1,3 +1,6 @@
+# Normalize EOF
+* autocrlf=false
+* eol=lf
 # Set linguist-language to support comments syntax highlight
 **/stubtest_allowlist*.txt linguist-language=ini
 tests/stubtest_allowlists/*.txt linguist-language=ini

.github/workflows/daily.yml

@@ -36,28 +36,19 @@ jobs:
       matrix:
         # tkinter doesn't import on macOS-12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        if: ${{ matrix.os != 'macos-11' || matrix.python-version != '3.7' }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: requirements-tests.txt
           allow-prereleases: true
-        # Handle the py37 run on macos differently,
-        # to workaround https://github.com/actions/setup-python/issues/682
-      - name: Setup Python 3.7.16 on macos
-        if: ${{ matrix.os == 'macos-11' && matrix.python-version == '3.7' }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.7.16"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
+          check-latest: true
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
       - name: Run stubtest
@@ -73,7 +64,7 @@ jobs:
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
@@ -107,23 +98,24 @@ jobs:
           fi
 
           $PYTHON_EXECUTABLE tests/stubtest_third_party.py --specified-platforms-only --num-shards 4 --shard-index ${{ matrix.shard-index }}
+
   stub-uploader:
     name: Run the stub_uploader tests
+    if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - name: Checkout typeshed
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: typeshed
       - name: Checkout stub_uploader
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: typeshed-internal/stub_uploader
           path: stub_uploader
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
           cache-dependency-path: stub_uploader/requirements.txt
       - name: Run tests

.github/workflows/typecheck_typeshed_code.yml renamed to .github/workflows/meta_tests.yml

@@ -1,4 +1,5 @@
-name: Typecheck-typeshed-code
+# This workflow is for testing typeshed's scripts and tests themselves
+name: Meta-tests
 
 on:
   workflow_dispatch:
@@ -9,8 +10,9 @@ on:
     paths:
       - "scripts/**"
       - "tests/**"
-      - ".github/workflows/typecheck_typeshed_code.yml"
+      - ".github/workflows/meta_tests.yml"
       - "requirements-tests.txt"
+      - "pyproject.toml"
 
 permissions:
   contents: read
@@ -32,7 +34,7 @@ jobs:
         platform: ["linux", "win32"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -48,7 +50,7 @@ jobs:
         python-platform: ["Linux", "Windows"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
@@ -62,9 +64,25 @@ jobs:
           file: "pyproject.toml"
           field: "tool.typeshed.pyright_version"
       - name: Run pyright on typeshed
-        uses: jakebailey/pyright-action@v1
+        uses: jakebailey/pyright-action@v2
         with:
           version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: "3.9"
           project: ./pyrightconfig.scripts_and_tests.json
+  stubsabot-dry-run:
+    name: Stubsabot dry run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          cache: pip
+          cache-dependency-path: requirements-tests.txt
+      - name: Git config
+        run: |
+          git config --global user.name stubsabot
+          git config --global user.email '<>'
+      - run: pip install -r requirements-tests.txt
+      - run: python scripts/stubsabot.py --action-level local

.github/workflows/mypy_primer.yml

@@ -25,7 +25,7 @@ jobs:
         shard-index: [0, 1, 2, 3]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: typeshed_to_test
           fetch-depth: 0

.github/workflows/stubsabot.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.repository == 'python/typeshed'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # use an ssh key so that checks automatically run on stubsabot PRs
           ssh-key: ${{ secrets.STUBSABOT_SSH_PRIVATE_KEY }}

.github/workflows/stubtest_stdlib.yml

@@ -32,28 +32,19 @@ jobs:
       matrix:
         # tkinter doesn't import on macOS 12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        if: ${{ matrix.os != 'macos-11' || matrix.python-version != '3.7' }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: requirements-tests.txt
           allow-prereleases: true
-        # Handle the py37 run on macos differently,
-        # to workaround https://github.com/actions/setup-python/issues/682
-      - name: Setup Python 3.7.16 on macos
-        if: ${{ matrix.os == 'macos-11' && matrix.python-version == '3.7' }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.7.16"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
+          check-latest: true
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
       - name: Run stubtest

.github/workflows/stubtest_third_party.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v4