Merge branch 'master' into master

Author: Jake-Moss

.github/workflows/buildwheel.yml

@@ -42,11 +42,14 @@ jobs:
         if: ${{ matrix.os == 'windows-2019' }}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.20.0
         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
-          CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel && msys2 -c bin/cibw_before_build_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:
@@ -107,7 +110,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        # This list to be kept in sync with cibuildwheel config
+        # and python-requires in pyproject.toml.
+        python-version: ['3.10', '3.11', '3.12', '3.13-dev', 'pypy3.10']
 
     steps:
       - uses: actions/setup-python@v5
@@ -138,8 +143,62 @@ jobs:
       - run: pip install .
       - run: python -m flint.test --verbose
 
-  # Test that we can still make a coverage build with setuptools.
-  test_coverage_setuptools:
+  # Test build with minimum Cython and meson-python versions.
+  test_old_build_requires:
+    name: 'Test old Cython/meson-python'
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - run: sudo apt-get update
+      - run: sudo apt-get install libflint-dev
+      # The versions of cython and meson-python here should be kept in sync
+      # with those in pyproject.toml so that we test the stated minimum
+      # versions.
+      #
+      # 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" "meson-python==0.13" "ninja<1.11"'
+      - run: pip install --no-build-isolation .
+      - run: python -m flint.test --verbose
+
+  # For older Ubuntu we have to build Flint >= 3.0.0
+  test_flint_releases:
+    name: Test flint ${{ matrix.flint-tag }}
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        # Supported Flint versions:
+        flint-tag: ['v3.0.0', 'v3.0.1', 'v3.1.0', 'v3.1.1', 'v3.1.2']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - run: bin/install_flint_ubuntu.sh ${{ matrix.flint-tag }}
+      - run: pip install .
+      - run: python -m flint.test --verbose
+
+  # Test against flint main
+  test_flint_main:
+    name: Test flint main
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - run: bin/install_flint_ubuntu.sh main
+      # Need to disable flint version check to build against main
+      - run: pip install --config-settings=setup-args="-Dflint_version_check=false" .
+      - run: python -m flint.test --verbose
+
+  # Test that we can make a coverage build and report coverage
+  test_coverage_build:
     name: Test coverage setuptools build
     runs-on: ubuntu-24.04
     steps:
@@ -149,10 +208,43 @@ jobs:
           python-version: '3.12'
       - run: sudo apt-get update
       - run: sudo apt-get install libflint-dev
-      - run: pip install git+https://github.com/oscarbenjamin/cython.git@pr_relative_paths
+      # Need Cython's master branch until 3.1 is released because of:
+      # https://github.com/cython/cython/pull/6341
+      - run: pip install git+https://github.com/cython/cython.git@master
       - run: pip install -r requirements-dev.txt
       - run: bin/coverage.sh
 
+  # On new enough Ubuntu we can build against the system deb.
+  test_freethreaded:
+    name: Free-threaded ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04]
+        python-version: ['3.13-dev']
+    steps:
+      - uses: actions/checkout@v4
+      # Can't use actions/setup-python
+      # https://github.com/actions/setup-python/issues/771
+      # deadsnakes only works for Ubuntu...
+      - uses: deadsnakes/action@v3.1.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          nogil: true
+      - run: |
+          python --version --version
+          which python
+          python -c "import sysconfig; print(sysconfig.get_config_var('Py_GIL_DISABLED'))"
+          python -c "import sys; print(sys._is_gil_enabled())"
+      - run: sudo apt-get update
+      - run: sudo apt-get install libflint-dev
+      # Need Cython master until 3.1 is released
+      - run: pip install git+https://github.com/cython/cython.git@master
+      - run: pip install -r requirements-dev.txt
+      - run: pip install --no-build-isolation .
+      - run: python -m flint.test --verbose
+
   # Run SymPy test suite against python-flint master
   test_sympy:
     name: Test SymPy ${{ matrix.sympy-version }}
@@ -173,24 +265,6 @@ jobs:
       - run: pip install sympy==${{ matrix.sympy-version }}
       - run: python -c 'import sympy; sympy.test(parallel=True)'
 
-  # For older Ubuntu we have to build Flint >= 3.0.0
-  test_flint_versions:
-    name: Test flint ${{ matrix.flint-tag }}
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        # Supported versions and latest git
-        flint-tag: ['v3.0.0', 'v3.0.1', 'v3.1.0', 'v3.1.1', 'v3.1.2', 'main']
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - run: bin/install_flint_ubuntu.sh ${{ matrix.flint-tag }}
-      - run: pip install .
-      - run: python -m flint.test --verbose
-
   # Deploy wheels and sdist to PyPI
 
   pypi_release: