Skip to content

Ensure _apply_pyproject sets field on dist.metadata object not on dist #4834

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

Jump to bottom
Merged
abravalheri merged 1 commit into from
Feb 18, 2025
Merged

Ensure _apply_pyproject sets field on dist.metadata object not on dist #4834

abravalheri merged 1 commit into from
Feb 18, 2025

Conversation

@abravalheri
Copy link
Contributor

@abravalheri abravalheri commented Feb 17, 2025 •
edited
Loading

Summary of changes

Not sure why the tests where not failing, but I think this is the way we ensure dist.metadata.license_expression gets set instead of dist.license_expression.

(I guess the test hasattr(dist.metadata, field) is true? Is it always true? If not when it is false?)

Pull Request Checklist

@abravalheri
Copy link
Contributor Author

abravalheri commented Feb 17, 2025

/cc @cdce8p

@abravalheri abravalheri marked this pull request as ready for review February 17, 2025 18:36
@abravalheri abravalheri mentioned this pull request Feb 17, 2025
Merged
6 tasks
cdce8p
cdce8p approved these changes Feb 18, 2025
View reviewed changes
Copy link
Member

@cdce8p cdce8p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I guess the test hasattr(dist.metadata, field) is true? Is it always true? If not when it is false?)

I did add license_expression to _DISTUTILS_UNSUPPORTED_METADATA so it's always initialized to None on dist.metadata anyway.

setuptools/setuptools/dist.py

Lines 288 to 292 in 0a4eb8b

_DISTUTILS_UNSUPPORTED_METADATA = {
'long_description_content_type': lambda: None,
'project_urls': dict,
'provides_extras': dict, # behaves like an ordered set
'license_expression': lambda: None,

@abravalheri abravalheri merged commit 0d0d516 into pypa:feature/pep639 Feb 18, 2025
21 of 24 checks passed
@abravalheri abravalheri deleted the apply_pyproject branch February 18, 2025 10:45
@abravalheri
Copy link
Contributor Author

abravalheri commented Feb 18, 2025

Thank you I will add it just in case.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@cdce8p cdce8p cdce8p approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@abravalheri @cdce8p