Renable some previously disabled tests (due to old FLINT versions)

Author: oscarbenjamin

README.md

@@ -172,9 +172,9 @@ Contributors (0.10.0):
 
 Changes (0.10.0):
 
-- Drop support for FLINT versions older than 3.4.0 and remove the associated
+- [gh-424](https://github.com/flintlib/python-flint/pull/424),
+  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

doc/source/_gr.rst

@@ -20,9 +20,9 @@ variables over the Gaussian integers :math:`\mathbb{Z}[i][x,y]` we would do::
     >>> ctx.gens()
     [x, y]
 
-    # >>> ctx.gens_recursive()
-    # [I, x, y]
-    # >>> I, x, y = ctx.gens_recursive()
+    >>> ctx.gens_recursive()
+    [I, x, y]
+    >>> I, x, y = ctx.gens_recursive()
 
     >>> x, y = ctx.gens()
     >>> p = (x + y)**2

src/flint/test/test_docstrings.py

@@ -7,6 +7,15 @@
 
 dunder_test_regex = re.compile(r'^(.*?)__test__\.(.*?) \(line (\d+)\)$')
 
+# Minimum FLINT release required by doctests that use newer FLINT features.
+# Keys are doctest names and values are encoded __FLINT_RELEASE values, e.g.:
+#
+# test_flint_at_least = {
+#     "flint.types.example.example_method": 30700,
+# }
+test_flint_at_least = {}
+
+
 def find_doctests(module):
     finder = doctest.DocTestFinder()
     tests = []
@@ -32,6 +41,10 @@ def find_doctests(module):
                             raise Exception(f"Duplicate test name: {test.name}")
                         tests_seen.remove(test.name)
 
+                if test.name in test_flint_at_least:
+                    if test_flint_at_least[test.name] > flint.__FLINT_RELEASE__:
+                        continue
+
                 if test.name not in tests_seen:
                     tests_seen.add(test.name)
                     res.append(test)

src/flint/types/_gr.pxd

@@ -105,7 +105,7 @@ from flint.flintlib.functions.gr cimport (
     gr_one,
     gr_gen,
     gr_gens,
-    # gr_gens_recursive,
+    gr_gens_recursive,
     gr_ctx_set_gen_names,
 
     gr_i,
@@ -1017,25 +1017,25 @@ cdef class gr_ctx(flint_ctx):
             raise self._error(err, "Cannot compute min(x) in this context")
         return res
 
-    # @cython.final
-    # cdef inline list _gens_recursive(self):
-    #     cdef int err
-    #     cdef gr g
-    #     cdef gr_vec_t gens
-    #     gr_vec_init(gens, 0, self.ctx_t)
-    #     err = gr_gens_recursive(gens, self.ctx_t)
-    #     if err != GR_SUCCESS:
-    #         raise self._error(err, "Cannot get recursive generators")
-    #     length = gr_vec_length(gens, self.ctx_t)
-    #     py_gens = [None] * length
-    #     for 0 <= i < length:
-    #         g = self.new_gr()
-    #         err = gr_set(g.pval, gr_vec_entry_ptr(gens, i, self.ctx_t), self.ctx_t)
-    #         if err != GR_SUCCESS:
-    #             raise self._error(err, "Failed to copy generator.")
-    #         py_gens[i] = g
-    #     gr_vec_clear(gens, self.ctx_t)
-    #     return py_gens
+    @cython.final
+    cdef inline list _gens_recursive(self):
+        cdef int err
+        cdef gr g
+        cdef gr_vec_t gens
+        gr_vec_init(gens, 0, self.ctx_t)
+        err = gr_gens_recursive(gens, self.ctx_t)
+        if err != GR_SUCCESS:
+            raise self._error(err, "Cannot get recursive generators")
+        length = gr_vec_length(gens, self.ctx_t)
+        py_gens = [None] * length
+        for 0 <= i < length:
+            g = self.new_gr()
+            err = gr_set(g.pval, gr_vec_entry_ptr(gens, i, self.ctx_t), self.ctx_t)
+            if err != GR_SUCCESS:
+                raise self._error(err, "Failed to copy generator.")
+            py_gens[i] = g
+        gr_vec_clear(gens, self.ctx_t)
+        return py_gens
 
 
 cdef class gr_scalar_ctx(gr_ctx):

src/flint/types/_gr.pyx

@@ -344,17 +344,25 @@ cdef class gr_ctx(flint_ctx):
     def gens(self) -> list[gr]:
         """Return the top-level generators of the domain
 
-        # >>> from flint.types._gr import gr_fmpzi_ctx, gr_gr_mpoly_ctx
-        # >>> ctx = gr_gr_mpoly_ctx.new(gr_fmpzi_ctx, ['x', 'y'])
-        # >>> ctx.gens()
-        # [x, y]
-        # >>> gr_fmpzi_ctx.gens()
-        # [I]
-        # >>> ctx.gens_recursive()
-        # [I, x, y]
+        >>> from flint.types._gr import gr_fmpzi_ctx, gr_gr_mpoly_ctx
+        >>> ctx = gr_gr_mpoly_ctx.new(gr_fmpzi_ctx, ['x', 'y'])
+        >>> ctx.gens()
+        [x, y]
+        >>> gr_fmpzi_ctx.gens()
+        [I]
         """
         return self._gens()
 
+    def gens_recursive(self) -> list[gr]:
+        """Return the generators of the domain and its coefficient domains.
+
+        >>> from flint.types._gr import gr_fmpzi_ctx, gr_gr_mpoly_ctx
+        >>> ctx = gr_gr_mpoly_ctx.new(gr_fmpzi_ctx, ['x', 'y'])
+        >>> ctx.gens_recursive()
+        [I, x, y]
+        """
+        return self._gens_recursive()
+
     def is_zero(self, x) -> bool | None:
         """
         Returns whether x is equal to the ring element 0.
@@ -1096,21 +1104,21 @@ cdef class gr_fq_nmod_ctx(gr_scalar_ctx):
     def new(p, d, name=None) -> gr_fq_nmod_ctx:
         """Create a new context for finite fields.
 
-        # >>> from flint.types._gr import gr_fq_nmod_ctx
-        # >>> F9 = gr_fq_nmod_ctx.new(3, 2)
-        # >>> F9
-        # gr_fq_nmod_ctx(3, 2)
-        # >>> F9(2) + F9(3)
-        # 2
-        # >>> F9.characteristic()
-        # 3
-        # >>> F9.degree()
-        # 2
-        # >>> F9.gen()
-        # a
-        # >>> a = F9.gen()
-        # >>> (1 + a) ** 2 + a
-        # a+2
+        >>> from flint.types._gr import gr_fq_nmod_ctx
+        >>> F9 = gr_fq_nmod_ctx.new(3, 2)
+        >>> F9
+        gr_fq_nmod_ctx(3, 2)
+        >>> F9(2) + F9(3)
+        2
+        >>> F9.characteristic()
+        3
+        >>> F9.degree()
+        2
+        >>> F9.gen()
+        a
+        >>> a = F9.gen()
+        >>> (1 + a) ** 2 + a
+        a+2
         """
         cdef bytes name_b
         cdef char *name_c
@@ -1148,21 +1156,21 @@ cdef class gr_fq_zech_ctx(gr_scalar_ctx):
     def new(p, d, name=None) -> gr_fq_zech_ctx:
         """Create a new context for finite fields with small characteristic.
 
-        # >>> from flint.types._gr import gr_fq_zech_ctx
-        # >>> F9 = gr_fq_zech_ctx.new(3, 2)
-        # >>> F9
-        # gr_fq_zech_ctx(3, 2)
-        # >>> F9(2) + F9(3) # XXX: Is this correct?
-        # a^4
-        # >>> F9.characteristic()
-        # 3
-        # >>> F9.degree()
-        # 2
-        # >>> F9.gen()
-        # a^1
-        # >>> a = F9.gen()
-        # >>> (1 + a) ** 2 + a  # doctest: +SKIP
-        # a+2
+        >>> from flint.types._gr import gr_fq_zech_ctx
+        >>> F9 = gr_fq_zech_ctx.new(3, 2)
+        >>> F9
+        gr_fq_zech_ctx(3, 2)
+        >>> F9(2) + F9(3)
+        a^4
+        >>> F9.characteristic()
+        3
+        >>> F9.degree()
+        2
+        >>> F9.gen()
+        a^1
+        >>> a = F9.gen()
+        >>> (1 + a) ** 2 + a
+        a^7
         """
         cdef bytes name_b
         cdef char *name_c

src/flint/types/acb_theta.pyx

@@ -3,10 +3,8 @@ from flint.types.acb cimport acb
 from flint.types.acb_mat cimport acb_mat
 from flint.flintlib.functions.acb cimport *
 from flint.flintlib.types.acb cimport (
-    acb_mat_t,
     acb_mat_entry,
     acb_ptr,
-    acb_srcptr,
 )
 from flint.flintlib.functions.acb_mat cimport *
 from flint.flintlib.functions.acb_theta cimport *