Replace doctest runner by pytest in ci

.github/workflows/build.yml

@@ -428,7 +428,6 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       # Building
-
       - name: Generate Dockerfile
         # From docker.yml
         run: |
@@ -469,6 +468,7 @@ jobs:
                      --workdir $(pwd) \
                      ${{ env.BUILD_IMAGE }} /bin/sh
 
+
       # Combining
 
       - name: Download coverage artifacts

.github/workflows/ci-conda.yml

@@ -61,6 +61,12 @@ jobs:
           activate-environment: sage-dev
           environment-file: ${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
+      - name: Install test tools
+        shell: bash -l {0}
+        run: |
+          conda install -c conda-forge pytest-xdist pytest-github-actions-annotate-failures coverage
+          pip install pytest-isolate
+
       - name: Print Conda environment
         shell: bash -l {0}
         run: |
@@ -89,7 +95,7 @@ jobs:
       - name: Test
         if: success() || failure()
         shell: bash -l {0}
-        run: ./sage -t --all --baseline-stats-path=.github/workflows/ci-conda-known-test-failures.json -p0
+        run: ./sage -python -m pytest --doctest-ignore-import-errors --doctest -rfEs -s src
 
       - name: Print logs
         if: always()

.github/workflows/ci-meson.yml

@@ -103,7 +103,8 @@ jobs:
           # If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
           # so we don't delete the directory in this case
           ${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
-          ./sage -t --all -p4 --format github
+          pip install coverage pytest-xdist pytest-github-actions-annotate-failures pytest-isolate
+          pytest --doctest-ignore-import-errors --doctest -rfEs -s src
 
       - name: Upload log
         uses: actions/[email protected]

.vscode/settings.json

@@ -31,6 +31,7 @@
         "arctanh",
         "Bejger",
         "bigcup",
+        "bitness",
         "cachefunc",
         "charpoly",
         "classmethod",

conftest.py

@@ -138,7 +138,7 @@ def _find(
         except ModuleNotFoundError as exception:
             # TODO: Remove this once all optional things are using Features
             pytest.skip(
-                f"unable to import module { self.path } due to missing module { exception.name }"
+                f"unable to import module { self.path } due to missing feature { exception.name }"
             )
 
 

src/doc/en/developer/doctesting.rst

@@ -365,8 +365,8 @@ as taking a long time:
         on machines with "only" 2GB of RAM, we test ``max_n`` = 1, which
         has a more reasonable memory usage. ::
 
-            sage: from sage.crypto.mq.sr import test_consistency
-            sage: test_consistency(1)  # long time (80s on sage.math, 2011)
+            sage: from sage.crypto.mq.sr import check_consistency
+            sage: check_consistency(1)  # long time (80s on sage.math, 2011)
             True
         """
 

src/sage/algebras/fusion_rings/fusion_ring.py

@@ -33,7 +33,7 @@
 
 
 class FusionRing(WeylCharacterRing):
     r"""
     Return the Fusion Ring (Verlinde Algebra) of level ``k``.
 
     INPUT:
@@ -381,7 +381,7 @@
         tester.assertTrue(tqo.is_real_positive())
         tester.assertEqual(tqo**2, self.global_q_dimension(base_coercion=False))
 
-    def test_braid_representation(self, max_strands=6, anyon=None):
+    def check_braid_representation(self, max_strands=6, anyon=None):
         """
         Check that we can compute valid braid group representations.
 
@@ -402,10 +402,10 @@
         EXAMPLES::
 
             sage: A21 = FusionRing("A2", 1)
-            sage: A21.test_braid_representation(max_strands=4)
+            sage: A21.check_braid_representation(max_strands=4)
             True
             sage: F41 = FusionRing("F4", 1)            # long time
-            sage: F41.test_braid_representation()      # long time
+            sage: F41.check_braid_representation()      # long time
             True
         """
         if not self.is_multiplicity_free(): # Braid group representation is not available if self is not multiplicity free
@@ -524,7 +524,7 @@
         return CyclotomicField(4 * self._cyclotomic_order)
 
     def fvars_field(self):
         r"""
         Return a field containing the ``CyclotomicField`` computed by
         :meth:`field` as well as all the F-symbols of the associated
         ``FMatrix`` factory object.
@@ -1415,7 +1415,7 @@
         A class for FusionRing elements.
         """
         def is_simple_object(self):
             r"""
             Determine whether ``self`` is a simple object of the fusion ring.
 
             EXAMPLES::

src/sage/categories/cartesian_product.py

@@ -52,6 +52,7 @@ class CartesianProductFunctor(CovariantFunctorialConstruction, MultivariateConst
         sage: C = cartesian_product([M, ZZ, QQ])
         sage: C
         The Cartesian product of (M, Integer Ring, Rational Field)
+        sage: M.reset_name()
         sage: C.an_element()
         ('abcd', 1, 1/2)
         sage: C.an_element()^2

src/sage/categories/category_with_axiom.py

@@ -2534,29 +2534,29 @@
 :class:`Category_over_base_ring` becomes automatically a
 :class:`CategoryWithAxiom_over_base_ring`::
 
-    sage: from sage.categories.category_with_axiom import TestObjectsOverBaseRing, Category_over_base_ring
+    sage: from sage.categories.category_with_axiom import DummyObjectsOverBaseRing, Category_over_base_ring
     sage: from sage.categories.category import JoinCategory
-    sage: isinstance(TestObjectsOverBaseRing(QQ), Category_over_base_ring)
+    sage: isinstance(DummyObjectsOverBaseRing(QQ), Category_over_base_ring)
     True
-    sage: C = TestObjectsOverBaseRing(QQ).Commutative()
+    sage: C = DummyObjectsOverBaseRing(QQ).Commutative()
     sage: isinstance(C, Category_over_base_ring)          # todo: not implemented
     True
     sage: C.FiniteDimensional()
     Category of finite dimensional commutative test objects over base ring over Rational Field
     sage: C.Commutative()
     Category of commutative test objects over base ring over Rational Field
     sage: C.Unital()
     Category of commutative unital test objects over base ring over Rational Field
 
-    sage: C = TestObjectsOverBaseRing(IntegerModRing(2)).Connected()
+    sage: C = DummyObjectsOverBaseRing(IntegerModRing(2)).Connected()
     sage: isinstance(C, JoinCategory)
     True
     sage: isinstance(C, Category_over_base_ring)          # todo: not implemented
     True
     sage: C.FiniteDimensional()
     Category of finite dimensional connected test objects
      over base ring over Ring of integers modulo 2
     sage: C.Connected()
     Category of connected test objects over base ring over Ring of integers modulo 2
 """
 
@@ -2604,7 +2604,7 @@
 
     - :class:`Bars`
     - :class:`TestObjects`
-    - :class:`TestObjectsOverBaseRing`
+    - :class:`DummyObjectsOverBaseRing`
     """
 
     def super_categories(self):
@@ -2788,7 +2788,7 @@
         pass
 
 
-class TestObjectsOverBaseRing(Category_over_base_ring):
+class DummyObjectsOverBaseRing(Category_over_base_ring):
     r"""
     A toy singleton category, for testing purposes.
 
@@ -2799,14 +2799,14 @@
         """
         TESTS::
 
-            sage: from sage.categories.category_with_axiom import TestObjectsOverBaseRing
-            sage: TestObjectsOverBaseRing(QQ).super_categories()
+            sage: from sage.categories.category_with_axiom import DummyObjectsOverBaseRing
+            sage: DummyObjectsOverBaseRing(QQ).super_categories()
             [Category of test objects]
-            sage: TestObjectsOverBaseRing.Unital.an_instance()
-            Category of unital test objects over base ring over Rational Field
-            sage: TestObjectsOverBaseRing.FiniteDimensional.Unital.an_instance()
-            Category of finite dimensional unital test objects over base ring over Rational Field
-            sage: C = TestObjectsOverBaseRing(QQ).FiniteDimensional().Unital().Commutative()
+            sage: DummyObjectsOverBaseRing.Unital.an_instance()
+            Category of unital dummy objects over base ring over Rational Field
+            sage: DummyObjectsOverBaseRing.FiniteDimensional.Unital.an_instance()
+            Category of finite dimensional unital dummy objects over base ring over Rational Field
+            sage: C = DummyObjectsOverBaseRing(QQ).FiniteDimensional().Unital().Commutative()
             sage: TestSuite(C).run()
         """
         return [TestObjects()]

src/sage/crypto/mq/sr.py

@@ -3298,7 +3298,7 @@ def __exit__(self, typ, value, tb):
         self.sr._allow_zero_inversions = self.allow_zero_inversions
 
 
-def test_consistency(max_n=2, **kwargs):
+def check_consistency(max_n=2, **kwargs):
     r"""
     Test all combinations of ``r``, ``c``, ``e`` and ``n`` in ``(1,
     2)`` for consistency of random encryptions and their polynomial
@@ -3317,8 +3317,8 @@ def test_consistency(max_n=2, **kwargs):
     on machines with "only" 2GB of RAM, we test ``max_n`` = 1, which
     has a more reasonable memory usage. ::
 
-        sage: from sage.crypto.mq.sr import test_consistency
-        sage: test_consistency(1)  # long time (65s on sage.math, 2012)
+        sage: from sage.crypto.mq.sr import check_consistency
+        sage: check_consistency(1)  # long time (65s on sage.math, 2012)
         True
     """
     consistent = True

src/sage/databases/oeis.py

@@ -1928,7 +1928,7 @@ def flush_to_table(language, code_lines):
             return sorted(table)
         return sorted(prog for la, prog in table if la == language)
 
-    def test_compile_sage_code(self):
+    def check_compile_sage_code(self):
         """
         Try to compile the extracted sage code, if there is any.
 
@@ -1944,13 +1944,13 @@ def test_compile_sage_code(self):
         One correct sequence::
 
             sage: s = oeis.find_by_id('A027642')        # optional -- internet
-            sage: s.test_compile_sage_code()            # optional -- internet
+            sage: s.check_compile_sage_code()            # optional -- internet
             True
 
         One dead sequence::
 
             sage: s = oeis.find_by_id('A000154')        # optional -- internet
-            sage: s.test_compile_sage_code()            # optional -- internet
+            sage: s.check_compile_sage_code()            # optional -- internet
             True
         """
         if self.is_dead():

src/sage/doctest/forker.py

@@ -293,7 +293,7 @@ def showwarning_with_traceback(message, category, filename, lineno, file=None, l
     lines.extend(traceback.format_exception_only(category, category(message)))
 
     if file is None:
-        file = sys.stderr
+        file = sys.stdout
     try:
         file.writelines(lines)
         file.flush()
@@ -517,7 +517,7 @@ def getvalue(self):
 TestResults = namedtuple('TestResults', 'failed attempted')
 
 
-class SageDocTestRunner(doctest.DocTestRunner):
+class SageDocTestRunner(doctest.DocTestRunner, object):
     def __init__(self, *args, **kwds):
         """
         A customized version of DocTestRunner that tracks dependencies
@@ -706,10 +706,10 @@ def compiler(example):
                 # findlinestarts() returns pairs (index, lineno) where
                 # "index" is the index in the bytecode where the line
                 # number changes to "lineno".
-                linenumbers1 = {lineno for (index, lineno)
-                                in findlinestarts(code)}
-                linenumbers2 = {lineno for (index, lineno)
-                                in findlinestarts(execcode)}
+                linenumbers1 = set(lineno for (index, lineno)
+                                   in findlinestarts(code))
+                linenumbers2 = set(lineno for (index, lineno)
+                                   in findlinestarts(execcode))
                 if linenumbers1 != linenumbers2:
                     raise SyntaxError("doctest is not a single statement")
 
@@ -1855,17 +1855,6 @@ def parallel_dispatch(self):
         """
         opt = self.controller.options
 
-        job_client = None
-        try:
-            from gnumake_tokenpool import JobClient, NoJobServer
-        except ImportError:
-            pass
-        else:
-            try:
-                job_client = JobClient(use_cysignals=True)
-            except NoJobServer:
-                pass
-
         source_iter = iter(self.controller.sources)
 
         # If timeout was 0, simply set a very long time
@@ -1987,9 +1976,6 @@ def sel_exit():
                             w.copied_pid = w.pid
                             w.close()
                             finished.append(w)
-                            if job_client:
-                                job_client.release()
-
                     workers = new_workers
 
                     # Similarly, process finished workers.
@@ -2024,14 +2010,11 @@ def sel_exit():
                         break
 
                     # Start new workers if possible
-                    while (source_iter is not None and len(workers) < opt.nthreads
-                           and (not job_client or job_client.acquire())):
+                    while source_iter is not None and len(workers) < opt.nthreads:
                         try:
                             source = next(source_iter)
                         except StopIteration:
                             source_iter = None
-                            if job_client:
-                                job_client.release()
                         else:
                             # Start a new worker.
                             import copy
@@ -2108,8 +2091,6 @@ def sel_exit():
                         sleep(die_timeout)
                         for w in workers:
                             w.kill()
-                            if job_client:
-                                job_client.release()
                     finally:
                         os._exit(0)
 
@@ -2403,7 +2384,7 @@ def save_result_output(self):
         try:
             self.result = self.result_queue.get(block=False)
         except Empty:
-            self.result = (0, DictAsObject({'err': 'noresult'}))
+            self.result = (0, DictAsObject(dict(err='noresult')))
         del self.result_queue
 
         self.outtmpfile.seek(0)
@@ -2601,8 +2582,8 @@ def __call__(self, options, outtmpfile=None, msgfile=None, result_queue=None, *,
             runner.basename = self.source.basename
             runner.filename = self.source.path
             N = options.file_iterations
-            results = DictAsObject({'walltime': [], 'cputime': [],
-                                    'err': None, 'walltime_skips': 0})
+            results = DictAsObject(dict(walltime=[], cputime=[],
+                                        err=None, walltime_skips=0))
 
             # multiprocessing.Process instances don't run exit
             # functions, so we run the functions added by doctests
@@ -2627,7 +2608,7 @@ def __call__(self, options, outtmpfile=None, msgfile=None, result_queue=None, *,
         except BaseException:
             exc_info = sys.exc_info()
             tb = "".join(traceback.format_exception(*exc_info))
-            result = (0, DictAsObject({'err': exc_info[0], 'tb': tb}))
+            result = (0, DictAsObject(dict(err=exc_info[0], tb=tb)))
 
         if result_queue is not None:
             result_queue.put(result, False)

src/sage/doctest/marked_output.py

@@ -1,6 +1,6 @@
 # sage_setup: distribution = sagemath-repl
 """
-Helper for attaching tolerance information to strings
+Helper for attaching metadata to doctest output.
 """
 
 # ****************************************************************************
@@ -24,6 +24,19 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
+from typing import TypedDict
+
+from typing_extensions import NotRequired, Unpack
+
+
+class MarkedOutputType(TypedDict):
+    random: NotRequired[bool]
+    rel_tol: NotRequired[float]
+    abs_tol: NotRequired[float]
+    tol: NotRequired[float]
+    bitness_32: NotRequired[str]
+    bitness_64: NotRequired[str]
+
 
 class MarkedOutput(str):
     """
@@ -44,12 +57,15 @@ class MarkedOutput(str):
         sage: MarkedOutput("56 µs")
         '56 \xb5s'
     """
+
     random = False
     rel_tol = 0
     abs_tol = 0
     tol = 0
+    bitness_32 = ""
+    bitness_64 = ""
 
-    def update(self, **kwds):
+    def update(self, **kwargs: Unpack[MarkedOutputType]):
         """
         EXAMPLES::
 
@@ -62,7 +78,7 @@ def update(self, **kwds):
             sage: s.abs_tol
             1.00000000000000e-7
         """
-        self.__dict__.update(kwds)
+        self.__dict__.update(kwargs)
         return self
 
     def __reduce__(self):
@@ -83,6 +99,11 @@ def __reduce__(self):
         """
         return make_marked_output, (str(self), self.__dict__)
 
+    def __eq__(self, value: object) -> bool:
+        if isinstance(value, MarkedOutput):
+            return str(self) == str(value) and self.__dict__ == value.__dict__
+        return False
+
 
 def make_marked_output(s, D):
     """