Run stubtest on py313 with macos and Windows in CI (#12020)

.github/workflows/daily.yml

@@ -37,7 +37,7 @@ jobs:
         # tkinter doesn't import on macOS-12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
         # TODO unpin the 3.11 and 3.12 micro versions
-        python-version: ["3.8", "3.9", "3.10", "3.11.8", "3.12.2"]
+        python-version: ["3.8", "3.9", "3.10", "3.11.8", "3.12.2", "3.13"]
       fail-fast: false
 
     steps:
@@ -57,26 +57,6 @@ jobs:
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py
 
-  stubtest-stdlib-py313:
-    name: Check py313-linux stdlib with stubtest
-    # TODO: get it passing on all platforms and add it to the main matrix
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: 3.13
-        cache: pip
-        cache-dependency-path: requirements-tests.txt
-        allow-prereleases: true
-        check-latest: true
-    - name: Install dependencies
-      run: pip install -r requirements-tests.txt
-    - name: Install mypy from git
-      run: pip install git+https://github.com/python/mypy@e8a26308d5d06925cf769b62f41ef2e4bc546ada
-    - name: Run stubtest
-      run: python tests/stubtest_stdlib.py
-
   stubtest-third-party:
     name: Check third party stubs with stubtest
     if: ${{ github.repository == 'python/typeshed' || github.event_name == 'workflow_dispatch' }}

.github/workflows/stubtest_stdlib.yml

@@ -33,7 +33,7 @@ jobs:
         # tkinter doesn't import on macOS 12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
         # TODO unpin 3.11 and 3.12 micro versions
-        python-version: ["3.8", "3.9", "3.10", "3.11.8", "3.12.2"]
+        python-version: ["3.8", "3.9", "3.10", "3.11.8", "3.12.2", "3.13"]
       fail-fast: false
 
     steps:
@@ -52,23 +52,3 @@ jobs:
         run: pip install git+https://github.com/python/mypy@e8a26308d5d06925cf769b62f41ef2e4bc546ada
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py
-
-  stubtest-stdlib-py313:
-    name: Check py313-linux stdlib with stubtest
-    # TODO: get it passing on all platforms and add it to the main matrix
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: 3.13
-        cache: pip
-        cache-dependency-path: requirements-tests.txt
-        allow-prereleases: true
-        check-latest: true
-    - name: Install dependencies
-      run: pip install -r requirements-tests.txt
-    - name: Install mypy from git
-      run: pip install git+https://github.com/python/mypy@e8a26308d5d06925cf769b62f41ef2e4bc546ada
-    - name: Run stubtest
-      run: python tests/stubtest_stdlib.py