👌 Refactor inventory to use wildcards

executablebooks · Jan 10, 2023 · 38559cb · 38559cb
1 parent 66881ef
commit 38559cb
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 125 deletions.
diff --git a/myst_parser/inventory.py b/myst_parser/inventory.py
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
@@ -22,18 +22,15 @@ def test_convert_roundtrip():
 
 def test_inv_filter(data_regression):
     with (STATIC / "objects_v2.inv").open("rb") as f:
-        inv = to_sphinx(load(f))
-    output = [m.asdict() for m in filter_inventories({"inv": inv}, "index")]
+        inv = load(f)
+    output = [m.asdict() for m in filter_inventories({"inv": inv}, targets="index")]
     data_regression.check(output)
 
 
-def test_inv_filter_fnmatch(data_regression):
+def test_inv_filter_wildcard(data_regression):
     with (STATIC / "objects_v2.inv").open("rb") as f:
-        inv = to_sphinx(load(f))
-    output = [
-        m.asdict()
-        for m in filter_inventories({"inv": inv}, "*index", fnmatch_target=True)
-    ]
+        inv = load(f)
+    output = [m.asdict() for m in filter_inventories({"inv": inv}, targets="*index")]
     data_regression.check(output)
 
 

diff --git a/tests/test_inventory/test_inv_cli_v1.yaml b/tests/test_inventory/test_inv_cli_v1.yaml
@@ -1,5 +1,6 @@
 name: foo
 version: '1.0'
+base_url: null
 objects:
   py:
     module:

diff --git a/tests/test_inventory/test_inv_cli_v2_options0_.yaml b/tests/test_inventory/test_inv_cli_v2_options0_.yaml
@@ -1,5 +1,6 @@
 name: Python
 version: ''
+base_url: null
 objects:
   std:
     label:

diff --git a/tests/test_inventory/test_inv_cli_v2_options1_.yaml b/tests/test_inventory/test_inv_cli_v2_options1_.yaml
@@ -1,5 +1,6 @@
 name: Python
 version: ''
+base_url: null
 objects:
   std:
     label:

diff --git a/tests/test_inventory/test_inv_cli_v2_options2_.yaml b/tests/test_inventory/test_inv_cli_v2_options2_.yaml
@@ -1,5 +1,6 @@
 name: Python
 version: ''
+base_url: null
 objects:
   std:
     doc:

diff --git a/tests/test_inventory/test_inv_cli_v2_options3_.yaml b/tests/test_inventory/test_inv_cli_v2_options3_.yaml
@@ -1,5 +1,6 @@
 name: Python
 version: ''
+base_url: null
 objects:
   std:
     label:

diff --git a/tests/test_inventory/test_inv_cli_v2_options4_.yaml b/tests/test_inventory/test_inv_cli_v2_options4_.yaml
@@ -1,5 +1,6 @@
 name: Python
 version: ''
+base_url: null
 objects:
   std:
     label:

diff --git a/tests/test_inventory/test_inv_filter.yml b/tests/test_inventory/test_inv_filter.yml
@@ -1,8 +1,9 @@
-- domain: std
+- base_url: null
+  domain: std
   inv: inv
+  loc: index.html
   name: index
   otype: doc
-  proj: Python
+  project: Python
   text: Title
-  uri: index.html
   version: ''
diff --git a/...est_inventory/test_inv_filter_fnmatch.yml → ...st_inventory/test_inv_filter_wildcard.yml b/...est_inventory/test_inv_filter_fnmatch.yml → ...st_inventory/test_inv_filter_wildcard.yml
@@ -1,32 +1,36 @@
-- domain: std
+- base_url: null
+  domain: std
   inv: inv
+  loc: genindex.html
   name: genindex
   otype: label
-  proj: Python
+  project: Python
   text: Index
-  uri: genindex.html
   version: ''
-- domain: std
+- base_url: null
+  domain: std
   inv: inv
+  loc: py-modindex.html
   name: modindex
   otype: label
-  proj: Python
+  project: Python
   text: Module Index
-  uri: py-modindex.html
   version: ''
-- domain: std
+- base_url: null
+  domain: std
   inv: inv
+  loc: py-modindex.html
   name: py-modindex
   otype: label
-  proj: Python
+  project: Python
   text: Python Module Index
-  uri: py-modindex.html
   version: ''
-- domain: std
+- base_url: null
+  domain: std
   inv: inv
+  loc: index.html
   name: index
   otype: doc
-  proj: Python
+  project: Python
   text: Title
-  uri: index.html
   version: ''