Added module flagging from libraries.json (boostorg#1900) (boostorg#1926)

daveoconnor · web-flow · commit cb5c4ab4924c · 2025-09-30T14:35:26.000-07:00
diff --git a/core/githubhelper.py b/core/githubhelper.py
@@ -623,6 +623,7 @@ def parse_libraries_json(self, libraries_json: dict) -> dict:
             "category": libraries_json.get("category", []),
             "maintainers": libraries_json.get("maintainers", []),
             "cxxstd": libraries_json.get("cxxstd"),
+            "cpp20_module_support": libraries_json.get("modules", False),
         }
 
     def parse_tag(self, tag_data: dict) -> dict:
diff --git a/core/tests/test_githubhelper.py b/core/tests/test_githubhelper.py
@@ -149,6 +149,7 @@ def test_parse_libraries_json():
         "category": ["Math"],
         "maintainers": [],
         "cxxstd": "14",
+        "modules": True,
     }
 
     parser = GithubDataParser()
diff --git a/docs/examples/libraries_multiple.json b/docs/examples/libraries_multiple.json
@@ -71,6 +71,7 @@
         "category": [
             "Function-objects"
         ],
-        "cxxstd": "03"
+        "cxxstd": "03",
+        "modules": true
     }
 ]
diff --git a/libraries/admin.py b/libraries/admin.py
@@ -348,7 +348,7 @@ def get_new_contributor_counts(self, pk):
 @admin.register(LibraryVersion)
 class LibraryVersionAdmin(admin.ModelAdmin):
     list_display = ["library", "version", "missing_docs", "documentation_url"]
-    list_filter = ["library", "version", "missing_docs"]
+    list_filter = ["library", "version", "missing_docs", "cpp20_module_support"]
     ordering = ["library__name", "-version__name"]
     search_fields = ["library__name", "version__name"]
     change_list_template = "admin/libraryversion_change_list.html"
diff --git a/libraries/migrations/0033_libraryversion_cpp20_module_support.py b/libraries/migrations/0033_libraryversion_cpp20_module_support.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-18 23:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("libraries", "0032_merge_20250905_1825"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="libraryversion",
+            name="cpp20_module_support",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/libraries/models.py b/libraries/models.py
@@ -449,6 +449,7 @@ class LibraryVersion(models.Model):
     deletions = models.IntegerField(default=0)
     files_changed = models.IntegerField(default=0)
     cpp_standard_minimum = models.CharField(max_length=50, blank=True, null=True)
+    cpp20_module_support = models.BooleanField(default=False)
     dependencies = models.ManyToManyField(
         "libraries.Library",
         symmetrical=False,
diff --git a/libraries/tests/test_github.py b/libraries/tests/test_github.py
@@ -71,6 +71,7 @@ def test_get_library_list(library_updater):
             "category": ["Test"],
             "authors": ["John Doe"],
             "maintainers": ["Jane Doe"],
+            "cpp20_module_support": False,
         }
     ]
     result = library_updater.get_library_list(gitmodules=gitmodules)
diff --git a/templates/libraries/_library_categorized_list_item.html b/templates/libraries/_library_categorized_list_item.html
@@ -6,14 +6,21 @@
     >{{ library_version.library.name }}</a>
   </td>
 
-  <td class="py-2 align-top w-12">
-    <span class="flex justify-center py-0 px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40 tabular-nums"
+  <td class="w-12 align-top pt-2.5 pr-2">
+    <span class="flex justify-center px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40 tabular-nums"
           title="{% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}C++ Version {{ library_version.cpp_standard_minimum }} or Later{% else %}C++ Version 03 or Later{% endif %}">
           <span class="text-white dark:text-gray-800 tracking-wide scale-x-75 origin-left w-6 text-nowrap whitespace-nowrap">C++</span>
           {% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %}
     </span>
   </td>
-  <td class="align-top">
+  <td class="w-8 pt-2 px-2 text-center align-top">
+    {% if library_version.cpp20_module_support %}
+    <span
+      class="text-sm font-bold text-gray-600"
+      title="Supports usage via C++ 20 modules (import)"><i class="fa-solid fa-puzzle-piece"></i></span>
+    {% endif %}
+  </td>
+  <td class="w-8 text-center align-top ">
     {% include "libraries/includes/_documentation_link_icon.html" %}
   </td>
   <td class="hidden md:block py-2 pl-3 align-top">{{ library_version.description|default:"No description provided for this version." }}</td>
diff --git a/templates/libraries/_library_grid_list_item.html b/templates/libraries/_library_grid_list_item.html
@@ -21,12 +21,17 @@ <h3 class="pb-2 text-xl md:text-2xl capitalize border-b border-gray-700">
     <p class="mb-3 text-gray-700 dark:text-gray-300">{{ library_version.description|default:"No description provided for this version." }}</p>
   </div>
   <div class="text-sm flex py-3 bottom-3 absolute w-4/5 md:w-11/12">
-    <div>
+    <div class="flex">
       <span class="flex justify-center py-0 px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40 tabular-nums"
         title="C++ Version {% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %} or Later">
         <span class="text-white dark:text-gray-800 tracking-wide scale-x-75 origin-left w-6 text-nowrap whitespace-nowrap">C++</span>
         {% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %}
       </span>
+      {% if library_version.cpp20_module_support %}
+      <span
+        class="ml-3 mt-[1px] text-sm font-bold text-gray-600"
+        title="Supports usage via C++ 20 modules (import)"><i class="fa-solid fa-puzzle-piece"></i></span>
+      {% endif %}
     </div>
 {#  <div class="w-1/6 tracking-wider text-charcoal dark:text-white/60">{% if library_version.library.first_boost_version %}{{ library_version.library.first_boost_version.release_date|years_since }} yrs{% endif %}</div>#}
     <div class="w-auto md:w-5/6 pl-2 text-right mr-2 font-bold capitalize  text-sky-600 dark:text-sky-300">
diff --git a/templates/libraries/_library_vertical_list_item.html b/templates/libraries/_library_vertical_list_item.html
@@ -1,22 +1,28 @@
 <tr class="border-0 md:border border-gray-200/10 border-dotted md:border-t-0 md:border-r-0 md:border-l-0 md:border-b-1  hover:bg-gray-100 dark:hover:bg-gray-700 transition-all duration-300 ease-in-out cursor-pointer"
 onclick="window.location='{% url 'library-detail' library_slug=library_version.library.slug version_slug=version_str %}'">
-  <td class="py-2 align-top md:w-1/5">
+  <td class="align-top md:w-1/5 pt-3">
     <a class="mr-1 pl-1 font-bold capitalize text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange"
        href="{% url 'library-detail' library_slug=library_version.library.slug version_slug=version_str %}">{{ library_version.library.name }}</a>
   </td>
-
-  <td class="py-2 px-2 align-top w-12">
-    <span class="flex justify-center py-0 px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40 tabular-nums"
+  <td class="align-top w-12 pt-3 pr-2">
+    <span class="flex justify-center px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40 tabular-nums"
           title="{% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}C++ Version {{ library_version.cpp_standard_minimum }} or Later{% else %}C++ Version 03 or Later{% endif %}">
           <span class="text-white dark:text-gray-800 tracking-wide scale-x-75 origin-left w-6 text-nowrap  whitespace-nowrap">C++</span>
           {% if library_version.cpp_standard_minimum and library_version.cpp_standard_minimum != 'None' %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %}
     </span>
   </td>
-  <td class="align-top">
+  <td class="w-8 text-center align-top pt-3">
+    {% if library_version.cpp20_module_support %}
+    <span
+      class="align-top text-sm font-bold text-gray-600 m-auto"
+      title="Supports usage via C++ 20 modules (import)"><i class="fa-solid fa-puzzle-piece"></i></span>
+    {% endif %}
+  </td>
+  <td class="w-8 align-top">
     {% include "libraries/includes/_documentation_link_icon.html" %}
   </td>
-  <td class="hidden md:block py-2 pl-3 align-top">{{ library_version.description|default:"No description provided for this version." }}</td>
+  <td class="align-top hidden md:block mt-2 pl-3 md:h-20 md:items-center h-full">{{ library_version.description|default:"No description provided for this version." }}</td>
 </tr>
-<tr class="block md:hidden pl-1">
+<tr class="block md:hidden pl-1 align-top">
   <td>{{ library_version.description|default:"No description provided for this version." }}</td>
 </tr>
diff --git a/templates/libraries/detail.html b/templates/libraries/detail.html
@@ -37,10 +37,17 @@
             <div class="pb-4 pt-1">
               <span
                 class="py-0 px-2 text-sm font-bold text-gray-600 rounded-full border dark:text-gray-300 bg-green/40 border-green/60 dark:bg-green/40"
-                title="C++ Version {% if library_version.cpp_standard_minimum %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %} or Later">
-                <span class="scale-x-75 text-white dark:text-gray-800 tracking-wide origin-left w-6 inline-block whitespace-nowrap">C++</span>
-                  {% if library_version.cpp_standard_minimum %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %}
-              </span>
+                title="C++ Version {% if library_version.cpp_standard_minimum %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %} or Later"
+              ><span
+                class="scale-x-75 text-white dark:text-gray-800 tracking-wide origin-left w-6 inline-block whitespace-nowrap"
+              >C++</span> {% if library_version.cpp_standard_minimum %}{{ library_version.cpp_standard_minimum }}{% else %}03{% endif %}</span>
+
+              {% if library_version.cpp20_module_support %}
+              <span
+                class="ml-2 text-sm font-bold text-gray-600 dark:text-gray-300"
+                title="Supports usage via C++ 20 modules (import)"><i class="fa-solid fa-puzzle-piece"></i></span>
+              {% endif %}
+
               <span class="float-right">{% if object.first_boost_version %}Added in Boost
                 {{ object.first_boost_version.display_name }}{% endif %}</span>
             </div>
diff --git a/templates/libraries/includes/_documentation_link_icon.html b/templates/libraries/includes/_documentation_link_icon.html
@@ -1,3 +1,3 @@
-<a class="text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange text-base block py-3 pr-2" href="{{ library_version.documentation_url }}" title="Documentation">
-  <i class="fa fa-book icon-link"></i>
+<a class="text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange text-base block py-3 text-center" href="{{ library_version.documentation_url }}" title="Documentation">
+  <i class="fa fa-book align-top"></i>
 </a>
diff --git a/versions/tasks.py b/versions/tasks.py
@@ -375,6 +375,7 @@ def import_library_versions(version_name, token=None, version_type="tag"):
                 defaults={
                     "data": lib_data,
                     "cpp_standard_minimum": lib_data.get("cxxstd"),
+                    "cpp20_module_support": lib_data.get("cpp20_module_support"),
                     "description": lib_data.get("description"),
                 },
             )

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,7 @@ def parse_libraries_json(self, libraries_json: dict) -> dict:`
`623`	`623`	`"category": libraries_json.get("category", []),`
`624`	`624`	`"maintainers": libraries_json.get("maintainers", []),`
`625`	`625`	`"cxxstd": libraries_json.get("cxxstd"),`
	`626`	`+ "cpp20_module_support": libraries_json.get("modules", False),`
`626`	`627`	`}`
`627`	`628`
`628`	`629`	`def parse_tag(self, tag_data: dict) -> dict:`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ def test_parse_libraries_json():`
`149`	`149`	`"category": ["Math"],`
`150`	`150`	`"maintainers": [],`
`151`	`151`	`"cxxstd": "14",`
	`152`	`+ "modules": True,`
`152`	`153`	`}`
`153`	`154`
`154`	`155`	`parser = GithubDataParser()`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`"category": [`
`72`	`72`	`"Function-objects"`
`73`	`73`	`],`
`74`		`- "cxxstd": "03"`
	`74`	`+ "cxxstd": "03",`
	`75`	`+ "modules": true`
`75`	`76`	`}`
`76`	`77`	`]`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ def test_get_library_list(library_updater):`
`71`	`71`	`"category": ["Test"],`
`72`	`72`	`"authors": ["John Doe"],`
`73`	`73`	`"maintainers": ["Jane Doe"],`
	`74`	`+ "cpp20_module_support": False,`
`74`	`75`	`}`
`75`	`76`	`]`
`76`	`77`	`result = library_updater.get_library_list(gitmodules=gitmodules)`