display License-Expression in project details if provided

pypi · Oct 24, 2024 · 101ce02 · 101ce02
1 parent 326bb61
commit 101ce02
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
@@ -2970,14 +2970,14 @@ msgid "Meta"
 msgstr ""
 
 #: warehouse/templates/includes/packaging/project-data.html:164
-#: warehouse/templates/includes/packaging/project-data.html:212
-#: warehouse/templates/includes/packaging/project-data.html:218
+#: warehouse/templates/includes/packaging/project-data.html:225
+#: warehouse/templates/includes/packaging/project-data.html:231
 msgid "Author:"
 msgstr ""
 
 #: warehouse/templates/includes/packaging/project-data.html:171
-#: warehouse/templates/includes/packaging/project-data.html:225
-#: warehouse/templates/includes/packaging/project-data.html:231
+#: warehouse/templates/includes/packaging/project-data.html:238
+#: warehouse/templates/includes/packaging/project-data.html:244
 #: warehouse/templates/pages/help.html:620
 msgid "Maintainer:"
 msgstr ""
@@ -2991,22 +2991,30 @@ msgid "These details have <b>not</b> been verified by PyPI"
 msgstr ""
 
 #: warehouse/templates/includes/packaging/project-data.html:205
+msgid "License Expression:"
+msgstr ""
+
+#: warehouse/templates/includes/packaging/project-data.html:210
+msgid "License Expression"
+msgstr ""
+
+#: warehouse/templates/includes/packaging/project-data.html:218
 msgid "License:"
 msgstr ""
 
-#: warehouse/templates/includes/packaging/project-data.html:239
+#: warehouse/templates/includes/packaging/project-data.html:252
 msgid "Tags"
 msgstr ""
 
-#: warehouse/templates/includes/packaging/project-data.html:251
+#: warehouse/templates/includes/packaging/project-data.html:264
 msgid "Requires:"
 msgstr ""
 
-#: warehouse/templates/includes/packaging/project-data.html:258
+#: warehouse/templates/includes/packaging/project-data.html:271
 msgid "Provides-Extra:"
 msgstr ""
 
-#: warehouse/templates/includes/packaging/project-data.html:268
+#: warehouse/templates/includes/packaging/project-data.html:281
 #: warehouse/templates/pages/classifiers.html:16
 #: warehouse/templates/pages/classifiers.html:21
 #: warehouse/templates/pages/sitemap.html:39

diff --git a/warehouse/templates/includes/packaging/project-data.html b/warehouse/templates/includes/packaging/project-data.html
@@ -199,7 +199,20 @@ <h6>{% trans %}Project links{% endtrans %}</h6>
 <div class="sidebar-section unverified">
   <h6>{% trans %}Meta{% endtrans %}</h6>
   <ul>
-  {% if license %}
+  {% if release.license_expression %}
+    <li>
+      <span>
+        <strong>{% trans %}License Expression:{% endtrans %}</strong> {{ release.license_expression }}
+        <br>
+          <small>
+            <i>
+              <a target="_blank" href="https://spdx.org/licenses/">SPDX</a>
+              <a target="_blank" href="https://spdx.github.io/spdx-spec/v2-draft/SPDX-license-expressions/">{% trans %}License Expression{% endtrans %}</a>
+            </i>
+        </small>
+      </span>
+    </li>
+  {% elif license %}
     <li>
       <span>
         <strong>{% trans %}License:{% endtrans %}</strong> {{ license }}