From 9026dc6c41f9ad8414c15e5b252576b515b55078 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Fri, 5 Sep 2025 11:50:49 -0700 Subject: [PATCH 1/4] Remove MinGW CI jobs Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 645351eec..51d13d789 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -99,7 +99,6 @@ jobs: - { os: macos-latest, shell: bash } - { os: macos-13, shell: bash } - { os: windows-latest, shell: pwsh } - - { os: windows-latest, shell: msys2, python-version: 'mingw64' } exclude: - { os: macos-latest, python-version: 3.9 } @@ -115,20 +114,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: 'recursive' - - name: Set up MSYS2 - if: matrix.python-version == 'mingw64' - uses: msys2/setup-msys2@v2 - with: - msystem: mingw64 - install: >- - mingw-w64-x86_64-python - mingw-w64-x86_64-python-pip - mingw-w64-x86_64-gcc - mingw-w64-x86_64-cmake - make - git - name: Set up Python ${{ matrix.python-version }} - if: matrix.python-version != 'mingw64' uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} From 03613c440e210f4a4f0435ad36e9b39c52497b2e Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Fri, 5 Sep 2025 13:55:07 -0700 Subject: [PATCH 2/4] Comment out the MinGW job Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 51d13d789..6bc48550d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -99,6 +99,8 @@ jobs: - { os: macos-latest, shell: bash } - { os: macos-13, shell: bash } - { os: windows-latest, shell: pwsh } +# \todo Disable MinGW which is failing intermittently. +# - { os: windows-latest, shell: msys2, python-version: 'mingw64' } exclude: - { os: macos-latest, python-version: 3.9 } @@ -114,7 +116,20 @@ jobs: - uses: actions/checkout@v4 with: submodules: 'recursive' +# - name: Set up MSYS2 +# if: matrix.python-version == 'mingw64' +# uses: msys2/setup-msys2@v2 +# with: +# msystem: mingw64 +# install: >- +# mingw-w64-x86_64-python +# mingw-w64-x86_64-python-pip +# mingw-w64-x86_64-gcc +# mingw-w64-x86_64-cmake +# make +# git - name: Set up Python ${{ matrix.python-version }} +# if: matrix.python-version != 'mingw64' uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} From eca810fe730738d04a0b770dc3fad579012aacad Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 8 Sep 2025 10:57:13 -0700 Subject: [PATCH 3/4] Try just disabling the check-manifest and lint check Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6bc48550d..aaa8c7444 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -99,8 +99,7 @@ jobs: - { os: macos-latest, shell: bash } - { os: macos-13, shell: bash } - { os: windows-latest, shell: pwsh } -# \todo Disable MinGW which is failing intermittently. -# - { os: windows-latest, shell: msys2, python-version: 'mingw64' } + - { os: windows-latest, shell: msys2, python-version: 'mingw64' } exclude: - { os: macos-latest, python-version: 3.9 } @@ -116,20 +115,20 @@ jobs: - uses: actions/checkout@v4 with: submodules: 'recursive' -# - name: Set up MSYS2 -# if: matrix.python-version == 'mingw64' -# uses: msys2/setup-msys2@v2 -# with: -# msystem: mingw64 -# install: >- -# mingw-w64-x86_64-python -# mingw-w64-x86_64-python-pip -# mingw-w64-x86_64-gcc -# mingw-w64-x86_64-cmake -# make -# git + - name: Set up MSYS2 + if: matrix.python-version == 'mingw64' + uses: msys2/setup-msys2@v2 + with: + msystem: mingw64 + install: >- + mingw-w64-x86_64-python + mingw-w64-x86_64-python-pip + mingw-w64-x86_64-gcc + mingw-w64-x86_64-cmake + make + git - name: Set up Python ${{ matrix.python-version }} -# if: matrix.python-version != 'mingw64' + if: matrix.python-version != 'mingw64' uses: actions/setup-python@v5.4.0 with: python-version: ${{ matrix.python-version }} @@ -142,6 +141,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel "flake8>=3.5" check-manifest - name: Run check-manifest and lint check + if: matrix.python-version != 'mingw64' run: make ci-prebuild - name: Build and Install run: | From 619eaaf1fa2b9accb454a58c941dde8296b20d3f Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Mon, 8 Sep 2025 11:14:59 -0700 Subject: [PATCH 4/4] Add comment Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index aaa8c7444..d8ec9d7aa 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -140,6 +140,9 @@ jobs: - name: Install python build dependencies run: | python -m pip install --upgrade pip setuptools wheel "flake8>=3.5" check-manifest + # \todo Temporarily disable check-manifest on MinGW, it is failing + # intermittently with this error: + # ModuleNotFoundError: No module named 'pip._vendor.distlib' - name: Run check-manifest and lint check if: matrix.python-version != 'mingw64' run: make ci-prebuild