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.

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

Customise merge behaviour depending on option. Fix #1803 #1984

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Conversation

joerick
Copy link
Contributor

@joerick joerick commented Aug 24, 2024

Fix for #1803, where the method used for merging the config-settings option - string concatenation - was of little use.

I broke out the TableFmt object into a protocol-like object called OptionFormat, where the formatting and merge rules can be customised more deeply. This is more explicit, and lets us be a bit more precise with how TOML object get converted into the options.

I intend to use the flexibility of the OptionsFormat structure to tackle the remaining abiguity around environment variable quoting, as seen in the xfails in the options_test.py unit test and discussed in #1271.

I broke out the TableFmt object into a protocol-like object called
OptionFormat, where the formatting and merge rules can be customised
more deeply. This is more explicit, and lets us be a bit more precise
with how TOML object get converted into the options.
@joerick joerick marked this pull request as ready for review August 24, 2024 18:20
cibuildwheel/options.py Show resolved Hide resolved
cibuildwheel/options.py Show resolved Hide resolved
cibuildwheel/options.py Outdated Show resolved Hide resolved
Co-authored-by: Matthieu Darbois <[email protected]>
@joerick joerick merged commit ca08f5f into main Sep 3, 2024
24 checks passed
@joerick joerick deleted the inherit-rules branch September 3, 2024 15:05
@henryiii
Copy link
Contributor

henryiii commented Sep 3, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants