Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement PEP 639, Metadata 2.4 #16949

Merged
merged 23 commits into from
Nov 13, 2024
Merged

Implement PEP 639, Metadata 2.4 #16949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2620974
run from my fork of packaging temporarily
ewdurbin Oct 22, 2024
d68ac53
add License-File and License-Expression fields to Release
ewdurbin Sep 6, 2024
40b2309
store license-expression and license-files when included
ewdurbin Oct 22, 2024
c890d8d
enforce that license-files exist in distributions
ewdurbin Oct 22, 2024
3259eb8
enforce License/License-Expression mutual exclusion
ewdurbin Oct 22, 2024
94f0d4b
clarify Release.license_files contents in comment
ewdurbin Oct 23, 2024
15daa6e
refactor license-file check for tar.gz sdists
ewdurbin Oct 23, 2024
e555ab1
harmonize with the definition of "root license directory"/"license di…
ewdurbin Oct 23, 2024
b9a10ea
fix comment
ewdurbin Oct 23, 2024
26db8df
Merge branch 'main' into pep_639
ewdurbin Oct 24, 2024
0457f44
sync License-File(s) and License-Expression metadata to Big Query
ewdurbin Oct 24, 2024
326bb61
add license_files and license_expression to JSON API
ewdurbin Oct 24, 2024
101ce02
display License-Expression in project details if provided
ewdurbin Oct 24, 2024
a00fdef
move to first commit of pypa/packaging including spdx bits!
ewdurbin Oct 24, 2024
12379e5
Merge branch 'main' into pep_639
ewdurbin Oct 25, 2024
0709950
update to latest pypa/packaging commit
ewdurbin Nov 7, 2024
19f15cf
Merge branch 'main' into pep_639
ewdurbin Nov 7, 2024
2fadec1
Merge branch 'main' into pep_639
ewdurbin Nov 7, 2024
12e16a5
Merge branch 'main' into pep_639
ewdurbin Nov 8, 2024
a968dd5
Merge branch 'main' into pep_639
ewdurbin Nov 13, 2024
a8dd469
zip file license-files check: add note to remove when 625 is implemented
ewdurbin Nov 13, 2024
74b7b8c
add 2 minute lock and statement timeouts to migrations
ewdurbin Nov 13, 2024
8c2859a
remove redundant metadata version gate for license-files check
ewdurbin Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions warehouse/locale/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand All @@ -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
Expand Down
15 changes: 14 additions & 1 deletion warehouse/templates/includes/packaging/project-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down