jupyter-book · chrisjsewell · May 5, 2021 · Apr 8, 2021 · Apr 9, 2021 · Apr 9, 2021
diff --git a/docs/_toc.yml b/docs/_toc.yml
@@ -1,4 +1,8 @@
 root: intro
+
+defaults:
+  titlesonly: true
+
 parts:
 
 - caption: Get started

diff --git a/jupyter_book/cli/main.py b/jupyter_book/cli/main.py
@@ -155,7 +155,7 @@ def build(
     get_config_only=False,
 ):
     """Convert your book's or page's content to HTML or a PDF."""
-    from sphinx_external_toc.api import MalformedError, parse_toc_yaml
+    from sphinx_external_toc.parsing import MalformedError, parse_toc_yaml
 
     from jupyter_book import __version__ as jbv
     from jupyter_book.sphinx import build_sphinx

diff --git a/setup.py b/setup.py
@@ -77,7 +77,7 @@
         "nbconvert<6",
         'importlib_metadata; python_version < "3.7"',
         "jsonschema",
-        "sphinx-external-toc==0.1.0a3",
+        "sphinx-external-toc==0.1.0a5",
         "sphinx_togglebutton",
         "sphinx-copybutton",
         "sphinx-comments",

diff --git a/tests/books/clean_cache/_toc.yml b/tests/books/clean_cache/_toc.yml
@@ -1 +1,3 @@
 root: index
+defaults:
+  titlesonly: true
diff --git a/tests/books/config/_toc.yml b/tests/books/config/_toc.yml
@@ -1 +1,3 @@
 root: index
+defaults:
+  titlesonly: true
diff --git a/tests/books/config_custombuilder/_toc.yml b/tests/books/config_custombuilder/_toc.yml
@@ -1 +1,3 @@
 root: index
+defaults:
+  titlesonly: true
diff --git a/tests/books/nested-pdflatex/_toc.yml b/tests/books/nested-pdflatex/_toc.yml
@@ -1,4 +1,6 @@
 root: source/index
+defaults:
+  titlesonly: true
 sections:
 - file: source/content
   sections:

diff --git a/tests/books/nested/_toc.yml b/tests/books/nested/_toc.yml
@@ -1,3 +1,5 @@
 root: intro
+defaults:
+  titlesonly: true
 sections:
 - file: contents/markdown
diff --git a/tests/books/sphinx_syntaxerr/_toc.yml b/tests/books/sphinx_syntaxerr/_toc.yml
@@ -1,2 +1,4 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
diff --git a/tests/books/toc/_toc.yml b/tests/books/toc/_toc.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 sections:
 - file: content1
   title: Content1

diff --git a/tests/books/toc/_toc_emptysections.yml b/tests/books/toc/_toc_emptysections.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: Empty chapter
 - caption: A section

diff --git a/tests/books/toc/_toc_mixedpartsfiles.yml b/tests/books/toc/_toc_mixedpartsfiles.yml
@@ -1,16 +1,18 @@
-- file: index
-  title: Toc
+root: index
+defaults:
+  titlesonly: true
+title: Toc
+sections:
+- file: content1
+  title: Content1
+- file: content2
+  title: Content2
+- file: content3
+  title: Content3
+- part: My chapter
   sections:
-  - file: content1
-    title: Content1
-  - file: content2
-    title: Content2
-  - file: content3
-    title: Content3
-  - part: My chapter
+  - file: subfolder/index
+    title: Subfolder
     sections:
-    - file: subfolder/index
-      title: Subfolder
-      sections:
-      - file: subfolder/asubpage
-        title: Asubpage
+    - file: subfolder/asubpage
+      title: Asubpage
diff --git a/tests/books/toc/_toc_nofileorurl.yml b/tests/books/toc/_toc_nofileorurl.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: A section
   sections:

diff --git a/tests/books/toc/_toc_numbered.yml b/tests/books/toc/_toc_numbered.yml
@@ -1,7 +1,9 @@
-defaults:
-  numbered: true
 root: index
 title: Toc
+defaults:
+  titlesonly: true
+options:
+  numbered: true
 sections:
 - file: content1
   title: Content1

diff --git a/tests/books/toc/_toc_numbered_depth.yml b/tests/books/toc/_toc_numbered_depth.yml
@@ -1,7 +1,9 @@
-defaults:
-  numbered: 1
 root: index
 title: Toc
+defaults:
+  titlesonly: true
+options:
+  numbered: 1
 sections:
 - file: content1
   title: Content1

diff --git a/tests/books/toc/_toc_numbered_depth_parts_subset.yml b/tests/books/toc/_toc_numbered_depth_parts_subset.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: Chapter 1
   numbered: true

diff --git a/tests/books/toc/_toc_numbered_parts.yml b/tests/books/toc/_toc_numbered_parts.yml
@@ -1,9 +1,10 @@
-defaults:
-  numbered: true
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: Chapter 1
+  numbered: true
   sections:
   - file: content1
     title: Content1
@@ -13,6 +14,7 @@ parts:
     - file: subfolder/asubpage
       title: Asubpage
 - caption: Chapter 2
+  numbered: true
   sections:
   - file: content2
     title: Content2

diff --git a/tests/books/toc/_toc_numbered_parts_subset.yml b/tests/books/toc/_toc_numbered_parts_subset.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: Chapter 1
   numbered: true

diff --git a/tests/books/toc/_toc_parts.yml b/tests/books/toc/_toc_parts.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 parts:
 - caption: A section
   sections:

diff --git a/tests/books/toc/_toc_simple.yml b/tests/books/toc/_toc_simple.yml
@@ -1,4 +1,6 @@
 root: index
+defaults:
+  titlesonly: true
 sections:
 - file: content1
 - file: content2
diff --git a/tests/books/toc/_toc_simple_changed.yml b/tests/books/toc/_toc_simple_changed.yml
@@ -1,4 +1,6 @@
 root: index
+defaults:
+  titlesonly: true
 sections:
 - file: content2
 - file: content1
diff --git a/tests/books/toc/_toc_startwithlist.yml b/tests/books/toc/_toc_startwithlist.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 sections:
 - file: content1
   title: Content1

diff --git a/tests/books/toc/_toc_url.yml b/tests/books/toc/_toc_url.yml
@@ -1,5 +1,7 @@
 url: index
 title: Toc
+defaults:
+  titlesonly: true
 sections:
 - url: content1
   title: Content1

diff --git a/tests/books/toc/_toc_urllink.yml b/tests/books/toc/_toc_urllink.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 sections:
 - file: content1
 - file: content2

diff --git a/tests/books/toc/_toc_urlwithouttitle.yml b/tests/books/toc/_toc_urlwithouttitle.yml
@@ -1,5 +1,7 @@
 root: index
 title: Toc
+defaults:
+  titlesonly: true
 sections:
 - url: http://somelink.com
   title: Content1

diff --git a/tests/books/toc/_toc_wrongkey.yml b/tests/books/toc/_toc_wrongkey.yml
@@ -1,6 +1,8 @@
 root: index
 title: Toc
 foo: bar
+defaults:
+  titlesonly: true
 sections:
 - file: content1
   title: Content1