diff --git a/src/sage/doctest/rif_tol.py b/src/sage/doctest/rif_tol.py index 619b2e500cd..1feee1131d5 100644 --- a/src/sage/doctest/rif_tol.py +++ b/src/sage/doctest/rif_tol.py @@ -25,12 +25,12 @@ # **************************************************************************** from sage.doctest.marked_output import MarkedOutput +from sage.rings.real_mpfi import RealIntervalField, RealIntervalFieldElement +_RIFtol: 'RealIntervalField | None' = None -_RIFtol = None - -def RIFtol(*args): +def RIFtol(*args) -> RealIntervalFieldElement: """ Create an element of the real interval field used for doctest tolerances. @@ -57,18 +57,7 @@ def RIFtol(*args): """ global _RIFtol if _RIFtol is None: - try: - # We need to import from sage.all to avoid circular imports. - from sage.rings.real_mpfi import RealIntervalField - except ImportError: - from warnings import warn - warn("RealIntervalField not available, ignoring all tolerance specifications in doctests") - - def fake_RIFtol(*args): - return 0 - _RIFtol = fake_RIFtol - else: - _RIFtol = RealIntervalField(1044) + _RIFtol = RealIntervalField(1044) return _RIFtol(*args) diff --git a/src/sage/rings/convert/meson.build b/src/sage/rings/convert/meson.build index 04b9e285593..e1b8654f6c0 100644 --- a/src/sage/rings/convert/meson.build +++ b/src/sage/rings/convert/meson.build @@ -14,7 +14,7 @@ foreach name, pyx : extension_data subdir: 'sage/rings/convert', install: true, include_directories: [inc_cpython, inc_rings], - dependencies: [py_dep, cypari2, gmp, gsl, mpfi, mpfr, pari], + dependencies: [py_dep, gmp, gsl, mpfi, mpfr], ) endforeach diff --git a/src/sage/rings/convert/mpfi.pyx b/src/sage/rings/convert/mpfi.pyx index 0c95ff6af94..69c904d7ae6 100644 --- a/src/sage/rings/convert/mpfi.pyx +++ b/src/sage/rings/convert/mpfi.pyx @@ -37,8 +37,6 @@ from sage.rings.complex_mpfr cimport ComplexNumber from sage.rings.complex_interval cimport ComplexIntervalFieldElement from sage.rings.complex_double cimport ComplexDoubleElement -from cypari2.gen cimport Gen - cdef inline int return_real(mpfi_ptr im) noexcept: """ @@ -440,6 +438,7 @@ cdef int mpfi_set_sage(mpfi_ptr re, mpfi_ptr im, x, field, int base) except -1: return return_real(im) # Complex + from cypari2.gen import Gen if isinstance(x, Gen): imag = x.imag() if im is NULL: