Skip a few files from doctestsing with pytest

.github/workflows/build.yml

@@ -174,7 +174,7 @@ jobs:
       - name: Imports
         run: |
           ../sage -python -m pip install pytest-xdist
-          ../sage -python -m pytest -c tox.ini -qq --doctest-modules --collect-only || true
+          ../sage -python -m pytest -c tox.ini -qq --doctest --collect-only || true
         working-directory: ./worktree-image/src
         env:
           # Increase the length of the lines in the "short summary"
@@ -184,7 +184,7 @@ jobs:
         if: contains(github.ref, 'pytest')
         run: |
           ../sage -python -m pip install coverage pytest-xdist
-          ../sage -python -m coverage run -m pytest -c tox.ini --doctest-modules || true
+          ../sage -python -m coverage run -m pytest -c tox.ini --doctest || true
         working-directory: ./worktree-image/src
         env:
           # Increase the length of the lines in the "short summary"

.vscode/launch.json

@@ -1,6 +1,20 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Sage: Pytest Doctests",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "args": [
+                "-c",
+                "src/tox.ini",
+                "--doctest",
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false
+        },
         {
             "name": "Sage: Pytest",
             "type": "python",
@@ -33,4 +47,4 @@
             "justMyCode": false
         }
     ],
-}
+}

src/bin/sage

@@ -1008,10 +1008,10 @@ if [ "$1" = '-pytest' -o "$1" = '--pytest' ]; then
             for a in $*; do
                 case $a in
                     -*) ;;
-                    *)  exec pytest --rootdir="$SAGE_SRC" --doctest-modules "$@"
+                    *)  exec pytest --rootdir="$SAGE_SRC" --doctest "$@"
                 esac
             done
-            exec pytest --rootdir="$SAGE_SRC" --doctest-modules "$@" "$SAGE_SRC"
+            exec pytest --rootdir="$SAGE_SRC" --doctest "$@" "$SAGE_SRC"
         else
             echo "Run 'sage -i pytest' to install"
         fi

src/conftest.py

@@ -22,8 +22,7 @@
     _patch_unwrap_mock_aware,
     get_optionflags,
 )
-from _pytest.pathlib import import_path, ImportMode
-
+from _pytest.pathlib import ImportMode, import_path
 from sage.doctest.parsing import SageDocTestParser, SageOutputChecker
 
 
@@ -141,10 +140,28 @@ def pytest_collect_file(
         # hit this here if someone explicitly runs `pytest some_file.pyx`.
         return IgnoreCollector.from_parent(parent)
     elif file_path.suffix == ".py":
-        if parent.config.option.doctestmodules:
+        if parent.config.option.doctest:
+            if file_path.name == "__main__.py":
+                # We don't allow tests to be defined in __main__.py files (because their import will fail).
+                return IgnoreCollector.from_parent(parent)
+            if file_path.name == "postprocess.py" and file_path.parent.name == "nbconvert":
+                # This is an executable file.
+                return IgnoreCollector.from_parent(parent)
             return SageDoctestModule.from_parent(parent, path=file_path)
 
 
+def pytest_addoption(parser):
+    # Add a command line option to run doctests
+    # (we don't use the built-in --doctest-modules option because then doctests are collected twice)
+    group = parser.getgroup("collect")
+    group.addoption(
+        "--doctest",
+        action="store_true",
+        default=False,
+        help="Run doctests in all .py modules",
+        dest="doctest",
+    )
+
 @pytest.fixture(autouse=True, scope="session")
 def add_imports(doctest_namespace: dict[str, Any]):
     """