flintlib · oscarbenjamin · Sep 6, 2025 · Sep 5, 2025 · Sep 6, 2025 · Sep 6, 2025
diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
@@ -22,13 +22,6 @@ jobs:
       - uses: msys2/setup-msys2@v2.29.0
         with:
           msystem: mingw64
-          # path-type inherit is used so that when cibuildwheel calls msys2 to
-          # run bin/cibw_before_build_windows.sh the virtual environment
-          # created by cibuildwheel will be available within msys2. The
-          # msys2/setup-msys2 README warns that using inherit here can be
-          # problematic in some situations. Maybe there is a better way to do
-          # this.
-          path-type: inherit
         if: ${{ startsWith( matrix.os , 'windows' ) }}
 
         # Install pkgconfig on Windows from choco rather than from msys and
@@ -46,10 +39,6 @@ jobs:
         env:
           # override setting in pyproject.toml to use msys2 instead of msys64 bash
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
-          #
-          # Don't need to create pythonXX.a under meson. Not needed any more:
-          #   CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_windows.sh
-          #
 
       - uses: actions/upload-artifact@v4
         with:
@@ -167,7 +156,7 @@ jobs:
       # We don't need to specify ninja as a requirement in pyproject.toml
       # because without --no-build-isolation meson-python handles it
       # automatically in get_requirements_for_build_wheel().
-      - run: 'pip install "cython==3.0.11" "meson-python==0.13" "ninja<1.11"'
+      - run: 'pip install "cython==3.0.11" "meson-python==0.18" "ninja<1.11"'
       - run: pip install --no-build-isolation .
       - run: python -m flint.test --verbose
 

diff --git a/bin/build_mingw64_wheel.sh b/bin/build_mingw64_wheel.sh
diff --git a/bin/cibw_before_all_linux_aarch64.sh b/bin/cibw_before_all_linux_aarch64.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-cat wheels/LICENSE_linux_wheels.txt >> LICENSE
-
 yum install -y xz
 bin/build_dependencies_unix.sh\
   --gmp gmp\

diff --git a/bin/cibw_before_all_linux_x86_64.sh b/bin/cibw_before_all_linux_x86_64.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-cat wheels/LICENSE_linux_wheels.txt >> LICENSE
-
 yum install -y xz
 bin/build_dependencies_unix.sh\
   --gmp gmp\

diff --git a/bin/cibw_before_all_macosx_arm64.sh b/bin/cibw_before_all_macosx_arm64.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-cat wheels/LICENSE_macos_wheels.txt >> LICENSE
-
 export CPPFLAGS=" --target=arm64-apple-macos11"
 export LDFLAGS=" -arch arm64"
 

diff --git a/bin/cibw_before_all_macosx_x86_64.sh b/bin/cibw_before_all_macosx_x86_64.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-cat wheels/LICENSE_macos_wheels.txt >> LICENSE
-
 brew install automake libtool
 
 bin/build_dependencies_unix.sh\

diff --git a/bin/cibw_before_all_windows.sh b/bin/cibw_before_all_windows.sh
@@ -2,23 +2,6 @@
 
 set -o errexit
 
-cat wheels/LICENSE_windows_wheels.txt >> LICENSE
-
-# Uncomment this to run cibuildwheel locally on Windows:
-# export PATH=$PATH:/c/msys64/usr/bin:/c/msys64/mingw64/bin
-
-#
-# Make a setup.cfg to specify compiling with mingw64 (even though it says
-# mingw32...)
-#
-
-# This is not needed any more for python-flint >= 0.7.0 because meson is now
-# used as the build system rather than setuptools:
-echo '[build]' > setup.cfg
-echo 'compiler = mingw32' >> setup.cfg
-cat setup.cfg
-
-# Install the mingw-w64 toolchain and build tools
 pacman -S --noconfirm \
     mingw-w64-x86_64-gcc\
     mingw-w64-x86_64-tools-git\
@@ -28,9 +11,9 @@ pacman -S --noconfirm \
     autoconf-wrapper\
     automake-wrapper\
     libtool\
+    git\
     #
 
-# This is slow with MinGW:
 bin/build_dependencies_unix.sh \
     --use-gmp-github-mirror\
     --patch-C23\

diff --git a/bin/cibw_before_build_windows.sh b/bin/cibw_before_build_windows.sh
diff --git a/bin/cibw_repair_wheel_command_windows.bat b/bin/cibw_repair_wheel_command_windows.bat
diff --git a/bin/cibw_repair_wheel_command_windows.sh b/bin/cibw_repair_wheel_command_windows.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     set -e
-    cat wheels/LICENSE_macos_wheels.txt >> LICENSE
     export CPPFLAGS=" --target=arm64-apple-macos11"
     export LDFLAGS=" -arch arm64"
@@ Expand Down @@