Merge pull request #192 from musicinmybrain/python3.13

Adapt to changes to doctest statistic tracking internals in Python 3.13

Author: ev-br

.github/workflows/pip.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ['3.11', '3.12', '3.13']
         numpy: ['"numpy<2.0"', "numpy"]
         os: [ubuntu-latest]
         pytest: [pytest]

scipy_doctest/impl.py

@@ -4,6 +4,7 @@
 import doctest
 from doctest import NORMALIZE_WHITESPACE, ELLIPSIS, IGNORE_EXCEPTION_DETAIL
 from itertools import zip_longest
+from sys import version_info
 
 import numpy as np
 
@@ -514,11 +515,15 @@ def report_failure(self, out, test, example, got):
     def get_history(self):
         """Return a dict with names of items which were run.
 
-        Actually the dict is `{name : (f, t)}`, where `name` is the name of
-        an object, and the value is a tuple of the numbers of examples which
-        failed and which were tried.
+        Actually the dict is `{name : (failures, tries, skips)}` (before Python
+        3.13, just `{name : (failures, tries, skips)}`) where `name` is the
+        name of an object, and the value is a tuple of the numbers of examples
+        which failed, were tried, and were skipped, respectively.
         """
-        return self._name2ft
+        if version_info >= (3, 13):
+            return self._stats
+        else:
+            return self._name2ft
 
 
 class DebugDTRunner(DTRunner):

scipy_doctest/tests/test_skipmarkers.py

@@ -1,4 +1,5 @@
 import doctest
+from sys import version_info
 
 try:
     import matplotlib.pyplot as plt    # noqa
@@ -57,7 +58,8 @@ def test_invalid_python_plus_skip(self):
                                    lineno=0)
         runner = DebugDTRunner()
         runner.run(test)
-        assert runner.get_history() == {'none : +SKIP': (0, 0)}
+        stats = (0, 1, 1) if version_info >= (3, 13) else (0, 0)
+        assert runner.get_history() == {'none : +SKIP': stats}
 
     def test_invalid_python_pseudocode(self):
         # Marking a test as pseudocode is equivalent to a +SKIP:
@@ -74,7 +76,8 @@ def test_invalid_python_pseudocode(self):
                                    lineno=0)
         runner = DebugDTRunner()
         runner.run(test)
-        assert runner.get_history() == {'none : pseudocode': (0, 0)}
+        stats = (0, 1, 1) if version_info >= (3, 13) else (0, 0)
+        assert runner.get_history() == {'none : pseudocode': stats}
 
 
 class TestPseudocodeMarkers:
@@ -125,7 +128,8 @@ def test_bogus_output(self):
         runner.run(test)
 
         # one example tried, of which zero failed
-        assert runner.get_history() == {'stopwords_bogus_output': (0, 1)}
+        stats = (0, 1, 0) if version_info >= (3, 13) else (0, 1)
+        assert runner.get_history() == {'stopwords_bogus_output': stats}
 
 
 class TestMayVary:
@@ -148,7 +152,8 @@ def test_may_vary(self):
         runner.run(test)
 
         # one example tried, of which zero failed
-        assert runner.get_history() == {'may_vary_markers': (0, 1)}
+        stats = (0, 1, 0) if version_info >= (3, 13) else (0, 1)
+        assert runner.get_history() == {'may_vary_markers': stats}
 
     def test_may_vary_source(self):
         # The marker needs to be added to the example output, not source.
@@ -164,7 +169,8 @@ def test_may_vary_source(self):
         runner.run(test)
 
         # one example tried, of which zero failed
-        assert runner.get_history() == {'may_vary_source': (0, 1)}
+        stats = (0, 1, 0) if version_info >= (3, 13) else (0, 1)
+        assert runner.get_history() == {'may_vary_source': stats}
 
     def test_may_vary_syntax_error(self):
         # `# may vary` markers do not mask syntax errors, unlike `# doctest: +SKIP`