Skip to content

Commit 7e65046

Browse files
committed
Fix tests
1 parent adf2b6f commit 7e65046

9 files changed

+57
-29
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ documents:
414414
numbered: true
415415
reversed: false
416416
items:
417-
- doc1
417+
- path: doc1
418+
title: null
418419
titlesonly: true
419420
title: null
420421
meta: {}

sphinx_external_toc/parsing.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from dataclasses import dataclass, fields
44
from pathlib import Path
55
from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Union
6+
import logging
67

78
import yaml
89

@@ -403,16 +404,16 @@ def _docitem_to_dict(
403404

404405
def _parse_item(item):
405406
if isinstance(item, FileItem):
406-
if item in site_map:
407+
if item.path in site_map:
407408
return _docitem_to_dict(
408-
site_map[item],
409+
site_map[item.path],
409410
site_map,
410411
depth=depth + 1,
411412
file_format=file_format,
412413
skip_defaults=skip_defaults,
413414
parsed_docnames=parsed_docnames,
414415
)
415-
return {FILE_KEY: str(item)}
416+
return {FILE_KEY: item.path}
416417
if isinstance(item, GlobItem):
417418
return {GLOB_KEY: str(item)}
418419
if isinstance(item, UrlItem):

sphinx_external_toc/tools.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from itertools import chain
55
from pathlib import Path, PurePosixPath
66
from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple, Union
7+
import logging
78

89
import yaml
910

tests/test_parsing/test_file_to_sitemap_basic_.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ documents:
1313
- caption: null
1414
hidden: true
1515
items:
16-
- subfolder/doc4
16+
- path: subfolder/doc4
17+
title: null
1718
- title: null
1819
url: https://example.com
1920
maxdepth: -1
@@ -27,9 +28,12 @@ documents:
2728
- caption: Part Caption
2829
hidden: true
2930
items:
30-
- doc1
31-
- doc2
32-
- doc3
31+
- path: doc1
32+
title: null
33+
- path: doc2
34+
title: null
35+
- path: doc3
36+
title: null
3337
maxdepth: -1
3438
numbered: true
3539
reversed: false

tests/test_parsing/test_file_to_sitemap_basic_compressed_.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ documents:
1313
- caption: null
1414
hidden: true
1515
items:
16-
- doc4
16+
- path: doc4
17+
title: null
1718
- title: null
1819
url: https://example.com
1920
maxdepth: -1
@@ -31,9 +32,12 @@ documents:
3132
- caption: null
3233
hidden: true
3334
items:
34-
- doc1
35-
- doc2
36-
- doc3
35+
- path: doc1
36+
title: null
37+
- path: doc2
38+
title: null
39+
- path: doc3
40+
title: null
3741
maxdepth: -1
3842
numbered: true
3943
reversed: false

tests/test_parsing/test_file_to_sitemap_exclude_missing_.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ documents:
99
- caption: null
1010
hidden: true
1111
items:
12-
- doc1
12+
- path: doc1
13+
title: null
1314
- subfolder/other*
1415
maxdepth: -1
1516
numbered: false

tests/test_parsing/test_file_to_sitemap_nested_.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ documents:
1313
- caption: null
1414
hidden: true
1515
items:
16-
- folder/subfolder/doc4
16+
- path: folder/subfolder/doc4
17+
title: null
1718
- folder/globfolder/*
1819
maxdepth: -1
1920
numbered: false
@@ -30,9 +31,12 @@ documents:
3031
- caption: null
3132
hidden: true
3233
items:
33-
- folder/doc1
34-
- folder/doc2
35-
- folder/doc3
34+
- path: folder/doc1
35+
title: null
36+
- path: folder/doc2
37+
title: null
38+
- path: folder/doc3
39+
title: null
3640
maxdepth: -1
3741
numbered: false
3842
reversed: false

tests/test_parsing/test_file_to_sitemap_tableofcontents_.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ documents:
1313
- caption: null
1414
hidden: true
1515
items:
16-
- doc1
16+
- path: doc1
17+
title: null
1718
maxdepth: -1
1819
numbered: false
1920
reversed: false
2021
titlesonly: false
2122
- caption: null
2223
hidden: true
2324
items:
24-
- doc2
25+
- path: doc2
26+
title: null
2527
maxdepth: -1
2628
numbered: false
2729
reversed: false

tests/test_tools/test_create_site_map_from_path.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@ documents:
1313
- caption: null
1414
hidden: true
1515
items:
16-
- 1_other
17-
- 11_other
18-
- subfolder1/index
19-
- subfolder2/index
20-
- subfolder3/no_index1
21-
- subfolder14/index
16+
- path: 1_other
17+
title: null
18+
- path: 11_other
19+
title: null
20+
- path: subfolder1/index
21+
title: null
22+
- path: subfolder2/index
23+
title: null
24+
- path: subfolder3/no_index1
25+
title: null
26+
- path: subfolder14/index
27+
title: null
2228
maxdepth: -1
2329
numbered: false
2430
reversed: false
@@ -34,7 +40,8 @@ documents:
3440
- caption: null
3541
hidden: true
3642
items:
37-
- subfolder14/subsubfolder/index
43+
- path: subfolder14/subsubfolder/index
44+
title: null
3845
maxdepth: -1
3946
numbered: false
4047
reversed: false
@@ -46,7 +53,8 @@ documents:
4653
- caption: null
4754
hidden: true
4855
items:
49-
- subfolder14/subsubfolder/other
56+
- path: subfolder14/subsubfolder/other
57+
title: null
5058
maxdepth: -1
5159
numbered: false
5260
reversed: false
@@ -62,7 +70,8 @@ documents:
6270
- caption: null
6371
hidden: true
6472
items:
65-
- subfolder2/other
73+
- path: subfolder2/other
74+
title: null
6675
maxdepth: -1
6776
numbered: false
6877
reversed: false
@@ -78,7 +87,8 @@ documents:
7887
- caption: null
7988
hidden: true
8089
items:
81-
- subfolder3/no_index2
90+
- path: subfolder3/no_index2
91+
title: null
8292
maxdepth: -1
8393
numbered: false
8494
reversed: false

0 commit comments

Comments
 (0)