Simplify build script

QuLogic · QuLogic · commit 76d1f3191f20 · 2023-03-27T18:33:20.000-04:00
There appears to be no need to write `all.yml` as nothing outside the
build script uses it. The effect of using it is to re-order items and
flatten the outer dictionary into list.

But we can just do all that work when reading, and the sorting in the
template.
diff --git a/python/build.py b/python/build.py
@@ -1,70 +1,34 @@
 #!/usr/bin/env python
 
+from collections import defaultdict
 from pathlib import Path
 import pprint
 
 from jinja2 import Template
 from yaml import safe_load
-from markdown import markdown
 import requests
 
-# concatenate yml files...
 
 here = Path(__file__).parent.resolve()
 
-all_path = here.parent / 'packages/all.yml'
-all_path.unlink(missing_ok=True)
-packages = (here.parent / 'packages').glob('*')
-
-
 print("Opening section names file")
 with (here.parent / 'section_names.yml').open() as f:
     section_names = safe_load(f)
 
 section_names = section_names['section_names']
 
 print("section_names", section_names)
-packs = dict()
-# divide the yml files into sections based on teh section tag...
-for package in packages:
-    with package.open('r') as fin:
-        pack = safe_load(fin)
-        if 'section' not in pack:
-            pack['section'] = 'miscellaneous'
-        if pack['section'] in packs:
-            packs[pack['section']] += [pack]   
-        else:
-            packs[pack['section']] = [pack]
-
-pprint.pprint(packs)
+config = defaultdict(list)
+for path in (here.parent / 'packages').glob('*'):
+    with path.open('r') as fin:
+        package = safe_load(fin)
+
+        # Divide the yml files into sections based on the section tag...
+        if 'section' not in package:
+            package['section'] = 'miscellaneous'
+        package['section'] = section_names[package['section'].lower()]
 
-with all_path.open('w') as out:
-    for secname in sorted(packs.keys()):
-        packs_sec = sorted(packs[secname], key=lambda i: i['repo'].split('/')[1].lower())
-        
-        out.write(f'  - name: {section_names[secname]}\n')
-        out.write(f'    packages:\n\n')
-        for pack in packs_sec:
-            out.write(f'    - repo: {pack["repo"]}\n')
-            for k, v in pack.items():
-                if k != 'repo':
-                    out.write(f'      {k}: {v}\n')
-        out.write('\n')
-                     
-
-
-print("Opening config file")
-with all_path.open() as f:
-    config = safe_load(f)
-pprint.pprint(config)
-print()
-
-for section in config:
-    print(section.get('name', ''))
-    if section.get('intro'):
-        section['intro'] = markdown(section['intro'])
-    for package in section['packages']:
-        print(f"  {package['repo']}")
+        print(f"  {package['repo']} -> {package['section']}")
         try:
             package['user'], package['repo_name'] = package['repo'].split('/')
         except:
@@ -73,7 +37,6 @@
         package['conda_package'] = package.get('conda_package', package['repo_name'])
         package['pypi_name'] = package.get('pypi_name', package['repo_name'])
 
-        package['section'] = section_names[package['section'].lower()]
         if package.get('badges'):
             package['badges'] = [x.strip() for x in package['badges'].split(',')]
         else:
@@ -125,11 +88,14 @@
             else:
                 package['site'] = package['site'].rstrip('/')
 
-template = Template((here / 'template.rst').read_text(),
-                    lstrip_blocks=True, trim_blocks=True)
+    config[package['section']].append(package)
 
-config = sorted(config, key = lambda i: i['name'])
+# Turn defaultdict into plain dict.
+config = {**config}
+pprint.pprint(config)
 
+template = Template((here / 'template.rst').read_text(),
+                    lstrip_blocks=True, trim_blocks=True)
 
 (here.parent / 'docs/source/packages.rst').write_text(f"""\
 Third-party and user-contributed packages
diff --git a/python/template.rst b/python/template.rst
@@ -2,19 +2,19 @@
 
   <div>
     <table id="packages">
-      {% for section in config %}
+      {% for section, packages in config | dictsort %}
       <tr>
         <th colspan=5>
-          {% with section_id = section.name | lower | replace(" ", "-") %}
+          {% with section_id = section | lower | replace(" ", "-") %}
           <h3 id="{{ section_id }}">
-            {{ section.name }}
+            {{ section }}
             <a class="headerlink" href="#{{ section_id }}" title="Permalink to this headline">#</a>
           </h3>
           {% endwith %}
         </th>
       </tr>
 
-      {% for package in section.packages %}
+      {% for package in packages | sort(attribute="repo_name") %}
       <tr>
         <td>
           <a href="https://github.com/{{ package.repo }}">
