Make FLINT 3.4 the minimum supported version

(Drop 3.0-3.3)

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -300,7 +300,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04]
+        os: [ubuntu-26.04]
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -332,7 +332,7 @@ jobs:
   # Test build with minimum Cython and meson-python versions.
   test_old_build_requires:
     name: 'Test old Cython/meson-python'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -353,7 +353,7 @@ jobs:
       - run: pip install --no-build-isolation .
       - run: python -m flint.test --verbose
 
-  # For older Ubuntu we have to build Flint >= 3.0.0
+  # Build and test against each supported FLINT release.
   test_flint_releases:
     name: Test flint ${{ matrix.flint-tag }}
     runs-on: ubuntu-22.04
@@ -362,11 +362,9 @@ jobs:
       matrix:
         # Supported Flint versions:
         flint-tag: [
-          'v3.0.1',
-          'v3.2.2',
-          'v3.3.1',
           'v3.4.0',
           'v3.5.0',
+          'v3.6.0',
         ]
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -416,7 +414,7 @@ jobs:
   # Test that we can make a coverage build and report coverage
   test_coverage_build_setuptools:
     name: Test coverage setuptools build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -432,7 +430,7 @@ jobs:
   # Test that we can make a coverage build and report coverage
   test_coverage_build_meson:
     name: Test coverage meson build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -448,7 +446,7 @@ jobs:
   # Run SymPy test suite against python-flint master
   test_sympy:
     name: Test SymPy ${{ matrix.sympy-version }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       fail-fast: false
       matrix:
@@ -472,7 +470,7 @@ jobs:
   # Run SymPy master branch agains python-flint main
   test_sympy_master:
     name: Test SymPy master
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:

README.md

@@ -37,11 +37,10 @@ Build from source
 -----------------
 
 For other platforms or architectures installation needs to build from source.
-First install FLINT 3. Starting with python-flint 0.5.0 older versions of Flint
-such as 2.9 are not supported any more. Note that as of Flint 3 Arb no longer
-needs to be built separately as it is now merged into Flint.
+First install FLINT 3.4 or newer. Note that as of Flint 3 Arb no longer needs
+to be built separately as it is now merged into Flint.
 
-As of e.g. Ubuntu 24.04 a new enough version of FLINT (at least version 3) can
+As of e.g. Ubuntu 26.04 a new enough version of FLINT (at least version 3.4) can
 be installed from the Ubuntu repos like
 
     sudo apt-get install libflint-dev
@@ -136,15 +135,14 @@ Compatibility table
 -------------------
 
 Generally each release of python-flint will be compatible with a range of
-Python versions. Since python-flint 0.5.0 the minimum supported Flint version
-is `3.0` and each release of python-flint supports all versions of Flint
-`>=3.0` available at the time of release.
+Python and FLINT versions. The supported range for each release is shown
+below.
 
 Compatible versions:
 
 | python-flint | Release date  | CPython     | FLINT      | Cython           |
 |--------------|---------------|-------------|------------|------------------|
-| `0.10.0`     | Not released  | `3.10-3.15` | `3.0-3.6`  | `3.1-3.3`        |
+| `0.10.0`     | Not released  | `3.10-3.15` | `3.4-3.6`  | `3.1-3.3`        |
 | `0.9.0`      |  3rd Jul 2026 | `3.10-3.14` | `3.0-3.6`  | `3.1-3.2`        |
 | `0.8.0`      | 29th Aug 2025 | `3.11-3.14` | `3.0-3.3`  | `3.1` only       |
 | `0.7.0`      | 16th Mar 2025 | `3.11-3.13` | `3.0-3.2`  | `3.0.11-3.1.0a1` |
@@ -174,6 +172,9 @@ Contributors (0.10.0):
 
 Changes (0.10.0):
 
+- Drop support for FLINT versions older than 3.4.0 and remove the associated
+  compatibility code. (OB)
+
 - [gh-421](https://github.com/flintlib/python-flint/pull/421),
   Add `zpoly` and `zcontent` methods to `fmpq_mpoly`, to get
   the primitive integer polynomial and the `fmpq` content, which

bin/patch-flint-windows-arm64-link-3.3.1.diff

@@ -27,7 +27,7 @@ do
       shift
     ;;
     --flint-commit)
-      # e.g. --flint-commit 3.3.1
+      # e.g. --flint-commit 3.4.0
       FLINT_COMMIT="$2"
       shift
       shift

bin/pyodide_build_dependencies.sh

@@ -20,7 +20,6 @@ variables over the Gaussian integers :math:`\mathbb{Z}[i][x,y]` we would do::
     >>> ctx.gens()
     [x, y]
 
-    # XXX: gens_recursive not available in FLINT < 3.1
     # >>> ctx.gens_recursive()
     # [I, x, y]
     # >>> I, x, y = ctx.gens_recursive()

doc/source/_gr.rst

@@ -16,16 +16,16 @@ Simple build instructions
 The simple explanation of how to build ``python-flint`` from source is that
 there are two steps:
 
-- Install ``FLINT >= 3.0`` (see :ref:`installing_the_dependencies` below).
+- Install ``FLINT >= 3.4`` (see :ref:`installing_the_dependencies` below).
 - Run ``pip install --no-binary python-flint python-flint``.
 
-For example on Ubuntu 24.04 (but not older versions of Ubuntu) and when installing
-``python-flint >= 0.7.0`` these two steps are::
+For example on Ubuntu 26.04 (but not older versions of Ubuntu) these two steps
+are::
 
     sudo apt-get install libflint-dev
     pip install --no-binary python-flint python-flint
 
-The first command installs ``FLINT 3.0.1`` system-wide. With the second command
+The first command installs ``FLINT 3.4.0`` system-wide. With the second command
 ``pip`` will download the source code for the latest release of
 ``python-flint`` from PyPI, build it and install it into the active Python
 environment. When building, ``pip`` will create a temporary isolated build
@@ -70,9 +70,8 @@ Compatibility and supported versions
 
 Generally each release of python-flint will be compatible with a range of
 Python versions as described in `SPEC 0
-<https://scientific-python.org/specs/spec-0000/>`_. Since python-flint 0.5.0
-the minimum supported FLINT version is ``3.0`` and each release of python-flint
-supports all versions of ``FLINT >= 3.0`` available at the time of release.
+<https://scientific-python.org/specs/spec-0000/>`_ and a range of FLINT
+versions. The supported range for each release is shown below.
 
 Compatible versions:
 
@@ -87,7 +86,7 @@ Compatible versions:
    * - 0.10.0
      - Not released
      - 3.10-3.15
-     - 3.0-3.6
+     - 3.4-3.6
      - 3.1-3.3
    * - 0.9.0
      - 3rd Jul 2026
@@ -289,15 +288,15 @@ The dependencies for building ``python-flint`` have changed over time. See
 :ref:`supported_versions` above for the versions of the dependencies that are
 supported by each version of ``python-flint``.
 
-As of ``python-flint 0.7.0`` the runtime dependencies are Python and FLINT (at
-least version 3.0) and the build-time dependencies are a C compiler,
+The runtime dependencies are Python and FLINT (at least version 3.4) and the
+build-time dependencies are a C compiler,
 ``Cython``, ``meson``, ``meson-python`` and ``ninja``. Commands shown above
 such as ``pip install .`` will install dependencies like ``Cython``, ``meson``
 etc automatically. If you already have Python and a C compiler then what needs
 to be installed before building ``python-flint`` is ``FLINT``.
 
-At the time of writing, few Linux distributions provide ``FLINT >= 3.0`` in
-their package repositories but for example on ``Ubuntu 24.04`` (but not any
+At the time of writing, few Linux distributions provide ``FLINT >= 3.4`` in
+their package repositories but for example on ``Ubuntu 26.04`` (but not any
 earlier Ubuntu versions) you can install a sufficiently recent ``FLINT`` with::
 
     sudo apt-get install libflint-dev
@@ -307,7 +306,7 @@ On MacOS you can install FLINT from homebrew with::
     brew install flint
 
 Other package managers may also provide ``FLINT`` but make sure that it is at
-least version ``3.0``.
+least version ``3.4``.
 
 Once ``FLINT`` is installed it should be possible to build ``python-flint``
 with any of the commands shown above e.g.::
@@ -326,7 +325,7 @@ that uses ``apt-get`` to install all dependencies needed to build ``FLINT``,
 then builds ``FLINT`` from git using a specified git ref, and then installs
 ``FLINT`` system-wide::
 
-    bin/install_flint_ubuntu.sh v3.0.1  # version 3.0.1
+    bin/install_flint_ubuntu.sh v3.4.0  # version 3.4.0
     bin/install_flint_ubuntu.sh main    # latest git
 
 The script can be adapted for other Linux distributions or MacOS to use

doc/source/build.rst

@@ -15,7 +15,7 @@ project(
 # if it seems like new releases do not always break the build of python-flint
 # then we can consider not using a speculative upper version cap here.
 #
-flint_lower = '>=3.0'
+flint_lower = '>=3.4'
 flint_upper = '<3.7'
 cython_lower = '>=3.0.11'
 cython_upper = '<3.4'
@@ -70,11 +70,6 @@ if get_option('flint_version_check')
   endif
 endif
 
-# flint.pc was missing -lflint until Flint 3.1.0
-if flint_dep.version().version_compare('<3.1')
-  flint_dep = cc.find_library('flint')
-endif
-
 pyflint_deps = [gmp_dep, mpfr_dep, flint_dep]
 
 add_project_arguments(

meson.build

@@ -54,7 +54,7 @@ cdef extern from "flint/acb_theta.h":
     int acb_theta_char_is_even(ulong ab, slong g)
     void acb_theta_char_table(ulong * ch, slong * e, const fmpz_mat_t mat, ulong ab, int all)
     void acb_theta_char_shuffle(acb_ptr res, const fmpz_mat_t mat, acb_srcptr th, int sqr, slong prec)
-    slong acb_theta_jet_nb(slong ord, slong g)
+    slong acb_theta_jet_nb(slong g, slong ord)
     slong acb_theta_jet_total_order(const slong * tup, slong g)
     void acb_theta_jet_tuples(slong * tups, slong ord, slong g)
     slong acb_theta_jet_index(const slong * tup, slong g)

src/flint/flintlib/functions/acb_theta.pxd

@@ -1,37 +1,9 @@
-from flint.flintlib.types.flint cimport slong
-from flint.flintlib.types.fmpz_mod cimport fmpz_mod_mpoly_ctx_t, fmpz_mod_mpoly_t
 from flint.flintlib.types.gr cimport gr_ctx_t, gr_ptr, gr_srcptr, gr_vec_t
 
 
 cdef extern from *:
     """
     #include "flint/gr.h"
-    #if __FLINT_RELEASE >= 30400 /* Flint 3.4.0 or later */
-    #include "flint/gr_series.h"
-    #endif
-
-    #if __FLINT_RELEASE >= 30400 /* Flint 3.4.0 or later */
-
-    #define compat_gr_ctx_init_gr_series(...) gr_series_ctx_init(__VA_ARGS__)
-    #define compat_gr_ctx_init_series_mod_gr_poly(...) gr_series_mod_ctx_init(__VA_ARGS__)
-
-    #else
-
-    #define compat_gr_ctx_init_gr_series(...) gr_ctx_init_gr_series(__VA_ARGS__)
-    #define compat_gr_ctx_init_series_mod_gr_poly(...) gr_ctx_init_series_mod_gr_poly(__VA_ARGS__)
-
-    #endif
-
-    #if __FLINT_RELEASE < 30200 /* Flint < 3.2.0 */
-
-    #define compat_fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(...) (void)0
-
-    #else
-
-    #define compat_fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(...) fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(__VA_ARGS__)
-
-    #endif
-
     #if __FLINT_RELEASE >= 30600 /* Flint 3.6.0 or later */
 
     #define compat_gr_factor(c, factors, exponents, x, flags, ctx) gr_factor(c, factors, (fmpz_vec_struct *) exponents, x, flags, ctx)
@@ -42,7 +14,4 @@ cdef extern from *:
 
     #endif
     """
-    void compat_gr_ctx_init_gr_series(gr_ctx_t ctx, gr_ctx_t base_ring, slong prec)
-    void compat_gr_ctx_init_series_mod_gr_poly(gr_ctx_t ctx, gr_ctx_t base_ring, slong n)
-    void compat_fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_t B, const slong * c, const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC)
     int compat_gr_factor(gr_ptr c, gr_vec_t factors, gr_vec_t exponents, gr_srcptr x, int flags, gr_ctx_t ctx)

src/flint/flintlib/functions/compat.pxd

@@ -43,17 +43,6 @@ cdef extern from "flint/fmpz.h":
     # Macros
     int COEFF_IS_MPZ(fmpz_struct x)
 
-cdef extern from *:
-    """
-    #if __FLINT_RELEASE < 30200 /* Flint < 3.2.0 */
-
-    /* Functions renamed in Flint 3.2.0 */
-    #define flint_rand_init flint_randinit
-    #define flint_rand_clear flint_randclear
-
-    #endif
-    """
-
 cdef extern from "flint/flint.h":
     # These defines are needed to work around a Cython bug.
     # Otherwise sizeof(ulong) will give the wrong size on 64 bit Windows.