toctree now includes plugin models

docs/sphinx-docs/doc-regen/makedocumentation.py

@@ -31,19 +31,24 @@ def call_regenmodel(filepath, regen_py):
     Runs regenmodel.py/regentoc.py (specified in parameter regen_py) with all found PY_FILES
     """
     REGENMODEL = abspath(regen_py)
+    # Initialize command to be executed
     command = [
         sys.executable,
         REGENMODEL,
-        filepath,
     ]
+    # Append each filepath to command individually if passed in many files
+    if type(filepath) == list:
+        for string in filepath:
+            command.append(string)
+    else:
+        command.append(filepath)
     subprocess.run(command)
 
 def main():
     TARGETS = get_main_docs()
-    print(TARGETS)
     for file in TARGETS:
         call_regenmodel(file, "regenmodel.py")
-        call_regenmodel(file, "regentoc.py")
+    call_regenmodel(TARGETS, "regentoc.py")
 
 if __name__ == "__main__":
     main()

docs/sphinx-docs/doc-regen/regentoc.py

@@ -63,10 +63,11 @@ def generate_toc(model_files):
     category = {} # type: Dict[str, List[str]]
     for item in model_files:
         # assume model is in sasmodels/models/name.py, and ignore the full path
+        # NOTE: No longer use shortened pathname for model because we also pull in models from .sasview/plugin_models
         model_name = basename(item)[:-3]
         if model_name.startswith('_'):
             continue
-        model_info = load_model_info(model_name)
+        model_info = load_model_info(item)
         if model_info.category is None:
             print("Missing category for", item, file=sys.stderr)
         else: