Build wheels for mypy 1.19.0-oaipatch

Author: michaelm-openai

.github/workflows/build.yml

@@ -6,6 +6,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+permissions:
+  contents: write
+
 jobs:
   generate_wheels_matrix:
     name: Generate wheels matrix
@@ -19,7 +22,7 @@ jobs:
         # use a commit hash checked into a file to get the mypy revision to build.
         # submodules prove problematic since .git is outside cibuildwheel's manylinux container
         run: |
-          git clone https://github.com/python/mypy.git --recurse-submodules
+          git clone https://github.com/michaelm-openai/mypy.git --recurse-submodules
           git -C mypy checkout $(cat mypy_commit)
       - name: Install cibuildwheel and pypyp
         run: |
@@ -56,15 +59,23 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
+      - name: Restore wheel cache
+        id: cache_wheels
+        uses: actions/cache@v4
+        with:
+          path: wheelhouse
+          key: wheels-${{ runner.os }}-${{ matrix.only }}-${{ hashFiles('mypy_commit') }}
       - name: Checkout mypy
         shell: bash
+        if: steps.cache_wheels.outputs.cache-hit != 'true'
         # use a commit hash checked into a file to get the mypy revision to build.
         # submodules prove problematic since .git is outside cibuildwheel's manylinux container
         run: |
-          git clone https://github.com/python/mypy.git --recurse-submodules
+          git clone https://github.com/michaelm-openai/mypy.git --recurse-submodules
           git -C mypy checkout $(cat mypy_commit)
 
       - uses: pypa/cibuildwheel@v3.3.1
+        if: steps.cache_wheels.outputs.cache-hit != 'true'
         with:
           config-file: cibuildwheel.toml
           package-dir: mypy
@@ -81,24 +92,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - name: Restore sdist cache
+        id: cache_sdist
+        uses: actions/cache@v4
+        with:
+          path: mypy/dist
+          key: sdist-${{ hashFiles('mypy_commit') }}
       - uses: actions/setup-python@v6
         name: Install Python
+        if: steps.cache_sdist.outputs.cache-hit != 'true'
         with:
           python-version: "3.14"
       - name: Checkout mypy
         shell: bash
+        if: steps.cache_sdist.outputs.cache-hit != 'true'
         run: |
           COMMIT=$(cat mypy_commit)
-          git clone https://github.com/python/mypy.git
+          git clone https://github.com/michaelm-openai/mypy.git
           cd mypy
           git checkout $COMMIT
           git submodule update --init --recursive
       - name: Run check-manifest
+        if: steps.cache_sdist.outputs.cache-hit != 'true'
         run: |
           cd mypy
           pip install check-manifest
           check-manifest -v
       - name: Build sdist and wheel
+        if: steps.cache_sdist.outputs.cache-hit != 'true'
         run: |
           cd mypy
           pip install --upgrade setuptools build
@@ -139,7 +160,7 @@ jobs:
         shell: bash
         run: |
           COMMIT=$(cat mypy_commit)
-          git clone https://github.com/python/mypy.git
+          git clone https://github.com/michaelm-openai/mypy.git
           cd mypy
           git checkout $COMMIT
           git submodule update --init --recursive
@@ -184,7 +205,7 @@ jobs:
         # https://github.com/actions/upload-release-asset/issues/47
         uses: actions/github-script@v8
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{secrets.GH_TOKEN}}
           script: |
             const fs = require('fs').promises;
             const { repo: { owner, repo }, sha } = context;

cibuildwheel.toml

@@ -23,38 +23,38 @@ linux.before-all = [
   "yum install -y llvm-toolset || yum -v install -y llvm-toolset",
 ]
 
-before-test = [
-  "pip install -r {project}/mypy/test-requirements.txt",
-]
+# before-test = [
+#   "pip install -r {project}/mypy/test-requirements.txt",
+# ]
 
 # pytest looks for configuration files in the parent directories of where the tests live.
 # since we are trying to run the tests from their installed location, we copy those into
 # the venv. Ew ew ew.
 # We don't run external mypyc tests since there's some issue with compilation on the
 # manylinux image we use.
-test-command = """ \
-  ( \
-     DIR=$(python -c 'import mypy, os; dn = os.path.dirname; print(dn(dn(mypy.__path__[0])))') \
-     && cp '{project}/mypy/pyproject.toml' '{project}/mypy/conftest.py' $DIR \
-\
-     && MYPY_TEST_DIR=$(python -c 'import mypy.test; print(mypy.test.__path__[0])') \
-     && MYPYC_TEST_DIR=$(python -c 'import mypyc.test; print(mypyc.test.__path__[0])') \
-\
-     && MYPY_TEST_PREFIX='{project}/mypy' pytest $MYPY_TEST_DIR $MYPYC_TEST_DIR -k 'not test_external' \
-   )
-"""
+# test-command = """ \
+#   ( \
+#      DIR=$(python -c 'import mypy, os; dn = os.path.dirname; print(dn(dn(mypy.__path__[0])))') \
+#      && cp '{project}/mypy/pyproject.toml' '{project}/mypy/conftest.py' $DIR \
+# \
+#      && MYPY_TEST_DIR=$(python -c 'import mypy.test; print(mypy.test.__path__[0])') \
+#      && MYPYC_TEST_DIR=$(python -c 'import mypyc.test; print(mypyc.test.__path__[0])') \
+# \
+#      && MYPY_TEST_PREFIX='{project}/mypy' pytest $MYPY_TEST_DIR $MYPYC_TEST_DIR -k 'not test_external' \
+#    )
+# """
 
 # I ran into some flaky tests on windows, so only run testcheck. it looks like we
 # previously didn't run any tests on windows wheels, so this is a net win.
-windows.test-command = """ \
-  bash -c "( \
-    DIR=$(python -c 'import mypy, os; dn = os.path.dirname; print(dn(dn(mypy.__path__[0])))') \
-    && cp '{project}/mypy/pyproject.toml' '{project}/mypy/conftest.py' $DIR \
-\
-    && MYPY_TEST_DIR=$(python -c 'import mypy.test; print(mypy.test.__path__[0])') \
-    && MYPY_TEST_PREFIX='{project}/mypy' pytest $MYPY_TEST_DIR/testcheck.py \
-  )"
-"""
+# windows.test-command = """ \
+#   bash -c "( \
+#     DIR=$(python -c 'import mypy, os; dn = os.path.dirname; print(dn(dn(mypy.__path__[0])))') \
+#     && cp '{project}/mypy/pyproject.toml' '{project}/mypy/conftest.py' $DIR \
+# \
+#     && MYPY_TEST_DIR=$(python -c 'import mypy.test; print(mypy.test.__path__[0])') \
+#     && MYPY_TEST_PREFIX='{project}/mypy' pytest $MYPY_TEST_DIR/testcheck.py \
+#   )"
+# """
 
 [tool.cibuildwheel.config-settings]
 --build-option = "--use-mypyc"
@@ -80,7 +80,7 @@ select = "*musllinux*"
 before-all = [
   "apk add --no-cache clang",
 ]
-before-test = [
-  "pip install -r {project}/mypy/test-requirements.txt",
-]
+# before-test = [
+#   "pip install -r {project}/mypy/test-requirements.txt",
+# ]
 environment = { MYPYC_OPT_LEVEL="3", MYPYC_DEBUG_LEVEL="0", CC="clang" }

mypy_commit

@@ -1 +1 @@
-7fee02ca109ad511bb55efd83ec13efc7f7eabfb
+abdb6f9fde76302cdc96cef06a9f52f523d6a54c