More updates for new versions

choldgraf · choldgraf · commit c190d44c5b69 · 2025-12-21T17:38:34.000-08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,8 +53,8 @@ jobs:
             pillow: "==11.0.0"
           # Newest known-compatible dependencies
           - os: ubuntu-latest
-            python-version: "3.12"
-            sphinx: "==8.0.2"
+            python-version: "3.13"
+            sphinx: "~=9.0.2"
             myst-parser: "==4.0.0"
             pillow: "==11.0.0"
 
diff --git a/myst_nb/sphinx_.py b/myst_nb/sphinx_.py
@@ -70,10 +70,10 @@ def parse(self, inputstring: str, document: nodes.document) -> None:
         :param inputstring: The source string to parse
         :param document: The root docutils node to add AST elements to
         """
-        env = getattr(document.settings, "env", self.env)
+        env = getattr(document.settings, "env", None)
         if env is None:
-            assert self.env is not None, "env not set"
             env = self.env
+        assert env is not None, "env not set"
         document_path = env.doc2path(env.docname)
 
         # get a logger for this document
diff --git a/pyproject.toml b/pyproject.toml
@@ -177,7 +177,7 @@ filterwarnings = [
     # From myst-parser on Sphinx 9
     'ignore:.*MystReferenceResolver.app.*:sphinx.deprecation.RemovedInSphinx11Warning',
     # Upstream myst-parser still hits env.app deprecations under Sphinx 9
-    'ignore::sphinx.deprecation.RemovedInSphinx90Warning:myst_parser',
+    'ignore:.*env\\.app.*:sphinx.deprecation.RemovedInSphinx10Warning:myst_parser',
     # Windows issues, some may need to be fixed in MyST-NB, others are upstream
     'ignore:Proactor event loop does not implement add_reader:RuntimeWarning:zmq',
 ]
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -21,6 +21,7 @@
 from sphinx.util.console import nocolor
 
 pytest_plugins = "sphinx.testing.fixtures"
+LATEST_SPHINX_MAJOR = 9
 
 # -Diff Configuration-#
 NB_VERSION = 4
@@ -100,7 +101,9 @@ def invalidate_files(self):
     def get_resolved_doctree(self, docname=None):
         """Load and return the built docutils.document, after post-transforms."""
         docname = docname or self.files[0]
-        doctree = self.env.get_and_resolve_doctree(docname, self.app.builder)
+        doctree = self.env.get_and_resolve_doctree(
+            docname, self.app.builder, tags=self.app.builder.tags
+        )
         doctree["source"] = docname
         return doctree
 
@@ -287,6 +290,9 @@ def _func(doctree):
 # alternatively the resolution of https://github.com/ESSS/pytest-regressions/issues/32
 @pytest.fixture()
 def file_regression(file_regression):
+    # Only run regression tests on the latest Sphinx since minor document changes will cause these to break otherwise
+    if sphinx_version_info[0] < LATEST_SPHINX_MAJOR:
+        pytest.skip("file-regression checks run only on the latest Sphinx")
     return FileRegression(file_regression)
 
 
diff --git a/tests/test_execute/test_allow_errors_auto.ipynb b/tests/test_execute/test_allow_errors_auto.ipynb
@@ -19,10 +19,10 @@
      "evalue": "oopsie!",
      "output_type": "error",
      "traceback": [
-      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
-      "\u001B[0;31mException\u001B[0m                                 Traceback (most recent call last)",
-      "Cell \u001B[0;32mIn[1], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mException\u001B[39;00m(\u001B[38;5;124m\"\u001B[39m\u001B[38;5;124moopsie!\u001B[39m\u001B[38;5;124m\"\u001B[39m)\n",
-      "\u001B[0;31mException\u001B[0m: oopsie!"
+      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
+      "\u001b[31mException\u001b[39m                                 Traceback (most recent call last)",
+      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[1]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m(\u001b[33m\"\u001b[39m\u001b[33moopsie!\u001b[39m\u001b[33m\"\u001b[39m)\n",
+      "\u001b[31mException\u001b[39m: oopsie!"
      ]
     }
    ],
@@ -47,7 +47,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.13.11"
   },
   "test_name": "notebook1"
  },
diff --git a/tests/test_execute/test_allow_errors_cache.ipynb b/tests/test_execute/test_allow_errors_cache.ipynb
@@ -19,10 +19,10 @@
      "evalue": "oopsie!",
      "output_type": "error",
      "traceback": [
-      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
-      "\u001B[0;31mException\u001B[0m                                 Traceback (most recent call last)",
-      "Cell \u001B[0;32mIn[1], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mException\u001B[39;00m(\u001B[38;5;124m\"\u001B[39m\u001B[38;5;124moopsie!\u001B[39m\u001B[38;5;124m\"\u001B[39m)\n",
-      "\u001B[0;31mException\u001B[0m: oopsie!"
+      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
+      "\u001b[31mException\u001b[39m                                 Traceback (most recent call last)",
+      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[1]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m(\u001b[33m\"\u001b[39m\u001b[33moopsie!\u001b[39m\u001b[33m\"\u001b[39m)\n",
+      "\u001b[31mException\u001b[39m: oopsie!"
      ]
     }
    ],
@@ -47,7 +47,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.13.11"
   },
   "test_name": "notebook1"
  },
diff --git a/tests/test_execute/test_basic_failing_auto.ipynb b/tests/test_execute/test_basic_failing_auto.ipynb
@@ -19,10 +19,10 @@
      "evalue": "oopsie!",
      "output_type": "error",
      "traceback": [
-      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
-      "\u001B[0;31mException\u001B[0m                                 Traceback (most recent call last)",
-      "Cell \u001B[0;32mIn[1], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mException\u001B[39;00m(\u001B[38;5;124m\"\u001B[39m\u001B[38;5;124moopsie!\u001B[39m\u001B[38;5;124m\"\u001B[39m)\n",
-      "\u001B[0;31mException\u001B[0m: oopsie!"
+      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
+      "\u001b[31mException\u001b[39m                                 Traceback (most recent call last)",
+      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[1]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m(\u001b[33m\"\u001b[39m\u001b[33moopsie!\u001b[39m\u001b[33m\"\u001b[39m)\n",
+      "\u001b[31mException\u001b[39m: oopsie!"
      ]
     }
    ],
@@ -47,7 +47,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.13.11"
   },
   "test_name": "notebook1"
  },
diff --git a/tests/test_execute/test_basic_failing_cache.ipynb b/tests/test_execute/test_basic_failing_cache.ipynb
@@ -19,10 +19,10 @@
      "evalue": "oopsie!",
      "output_type": "error",
      "traceback": [
-      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
-      "\u001B[0;31mException\u001B[0m                                 Traceback (most recent call last)",
-      "Cell \u001B[0;32mIn[1], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mException\u001B[39;00m(\u001B[38;5;124m\"\u001B[39m\u001B[38;5;124moopsie!\u001B[39m\u001B[38;5;124m\"\u001B[39m)\n",
-      "\u001B[0;31mException\u001B[0m: oopsie!"
+      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
+      "\u001b[31mException\u001b[39m                                 Traceback (most recent call last)",
+      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[1]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m(\u001b[33m\"\u001b[39m\u001b[33moopsie!\u001b[39m\u001b[33m\"\u001b[39m)\n",
+      "\u001b[31mException\u001b[39m: oopsie!"
      ]
     }
    ],
@@ -47,7 +47,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.13.11"
   },
   "test_name": "notebook1"
  },
diff --git a/tests/test_execute/test_basic_failing_inline.ipynb b/tests/test_execute/test_basic_failing_inline.ipynb
@@ -19,10 +19,10 @@
      "evalue": "oopsie!",
      "output_type": "error",
      "traceback": [
-      "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
-      "\u001B[0;31mException\u001B[0m                                 Traceback (most recent call last)",
-      "Cell \u001B[0;32mIn[1], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mException\u001B[39;00m(\u001B[38;5;124m\"\u001B[39m\u001B[38;5;124moopsie!\u001B[39m\u001B[38;5;124m\"\u001B[39m)\n",
-      "\u001B[0;31mException\u001B[0m: oopsie!"
+      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
+      "\u001b[31mException\u001b[39m                                 Traceback (most recent call last)",
+      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[1]\u001b[39m\u001b[32m, line 1\u001b[39m\n\u001b[32m----> \u001b[39m\u001b[32m1\u001b[39m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m(\u001b[33m\"\u001b[39m\u001b[33moopsie!\u001b[39m\u001b[33m\"\u001b[39m)\n",
+      "\u001b[31mException\u001b[39m: oopsie!"
      ]
     }
    ],
@@ -47,7 +47,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.13.11"
   },
   "test_name": "notebook1"
  },

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ filterwarnings = [`
`177`	`177`	`# From myst-parser on Sphinx 9`
`178`	`178`	`'ignore:.MystReferenceResolver.app.:sphinx.deprecation.RemovedInSphinx11Warning',`
`179`	`179`	`# Upstream myst-parser still hits env.app deprecations under Sphinx 9`
`180`		`- 'ignore::sphinx.deprecation.RemovedInSphinx90Warning:myst_parser',`
	`180`	`+ 'ignore:.env\\.app.:sphinx.deprecation.RemovedInSphinx10Warning:myst_parser',`
`181`	`181`	`# Windows issues, some may need to be fixed in MyST-NB, others are upstream`
`182`	`182`	`'ignore:Proactor event loop does not implement add_reader:RuntimeWarning:zmq',`
`183`	`183`	`]`