Skip to content

Commit

Permalink
Move Supported-Platform to form
Browse files Browse the repository at this point in the history
  • Loading branch information
konstin committed Feb 22, 2024
1 parent 3789124 commit bbc4cbb
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions warehouse/forklift/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,8 @@ def _validate_dynamic(_form, field):
raise wtforms.validators.ValidationError(
f"The following metadata field(s) cannot be marked as dynamic: {invalid!r}",
)
# "Supported-Platform" is missing in the metadata form since it does not have any
# constraints
allowed_dynamic_fields = (
{field.description for field in MetadataForm() if field.description}
| {"Supported-Platform"}
) - disallowed_dynamic_fields
if invalid := (declared_dynamic_fields - allowed_dynamic_fields):
raise wtforms.validators.ValidationError(
Expand Down Expand Up @@ -503,6 +500,9 @@ class MetadataForm(forms.Form):
author = wtforms.StringField(
description="Author", validators=[wtforms.validators.Optional()]
)
supported_platform = wtforms.StringField(
description="Supported-Platform", validators=[wtforms.validators.Optional()]
)
description_content_type = wtforms.StringField(
description="Description-Content-Type",
validators=[wtforms.validators.Optional(), _validate_description_content_type],
Expand Down Expand Up @@ -1193,15 +1193,15 @@ def file_upload(request):
tag=EventTag.Project.ReleaseAdd,
request=request,
additional={
"submitted_by": request.user.username
if request.user
else "OpenID created token",
"submitted_by": (
request.user.username if request.user else "OpenID created token"
),
"canonical_version": release.canonical_version,
"publisher_url": request.oidc_publisher.publisher_url(
request.oidc_claims
)
if request.oidc_publisher
else None,
"publisher_url": (
request.oidc_publisher.publisher_url(request.oidc_claims)
if request.oidc_publisher
else None
),
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
},
)
Expand Down Expand Up @@ -1468,15 +1468,15 @@ def file_upload(request):
request=request,
additional={
"filename": file_.filename,
"submitted_by": request.user.username
if request.user
else "OpenID created token",
"submitted_by": (
request.user.username if request.user else "OpenID created token"
),
"canonical_version": release.canonical_version,
"publisher_url": request.oidc_publisher.publisher_url(
request.oidc_claims
)
if request.oidc_publisher
else None,
"publisher_url": (
request.oidc_publisher.publisher_url(request.oidc_claims)
if request.oidc_publisher
else None
),
"project_id": str(project.id),
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
},
Expand Down

0 comments on commit bbc4cbb

Please sign in to comment.