sort as specified in schema

Author: wpbonelli

doc/ReleaseNotes/develop.tex.jinja

@@ -1,15 +1,20 @@
-([ for section_key, section_items in items|groupby("section") ])
-\subsection{(( sections[section_key].title() ))}
-([ for subsection_key, subsection_items in section_items|groupby("subsection") ])
-([ set subsection = subsections[subsection_key] ])
-([ if subsection|length > 0 ])
-\subsubsection{(( subsection.title() ))}
+([ for section_key, section_name in sections.items() ])
+([ set section_items = items|selectattr("section", "equalto", section_key)|list ])
+([ if section_items ])
+\subsection{(( section_name.title() ))}
+([ for subsection_key, subsection_name in subsections.items() ])
+([ set subsection_items = section_items|selectattr("subsection", "equalto", subsection_key)|list ])
+([ if subsection_items ])
+([ if subsection_name|length > 0 ])
+\subsubsection{(( subsection_name.title() ))}
 ([ endif ])
 
 \begin{itemize}
 ([ for item in subsection_items ])
 \item (( item.description ))
 ([ endfor ])
 \end{itemize}
+([ endif ])
 ([ endfor ])
+([ endif ])
 ([ endfor ])

doc/ReleaseNotes/mk_releasenotes.py

@@ -67,9 +67,8 @@
     if patch:
         items = [item for item in items if item["section"] == "fixes"]
         sections = {k: v for k, v in sections.items() if k == "fixes"}
-        subsections = {
-            k: subsections[k] for k in [item["subsection"] for item in items]
-        }
+        used_subsections = {item["subsection"] for item in items}
+        subsections = {k: v for k, v in subsections.items() if k in used_subsections}
     # make sure each item has a subsection entry even if empty
     for item in items:
         if not item.get("subsection"):

doc/ReleaseNotes/schema.toml

@@ -1,15 +1,15 @@
 [sections]
 features = "NEW FUNCTIONALITY"
-fixes = "BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY"
 examples = "EXAMPLES"
+fixes = "BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY"
 
 [subsections]
 basic = "BASIC FUNCTIONALITY"
-model = "MODEL"
 internal = "INTERNAL FLOW PACKAGES"
 stress = "STRESS PACKAGES"
 advanced = "ADVANCED STRESS PACKAGES"
-solution = "SOLUTION"
+model = "MODEL"
 exchanges = "EXCHANGES"
+solution = "SOLUTION"
 parallel = "PARALLEL"
 netcdf = "NETCDF"