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

feat: Windows filtering and sets #507

Merged
merged 2 commits into from
Jan 5, 2021

Conversation

henryiii
Copy link
Contributor

@henryiii henryiii commented Jan 1, 2021

Followup to #482, use sets instead of lists for Archs, and make Windows handling behave more like Linux, where one arch will only use that arch. (Eventually, maybe could include ARM for windows, perhaps?).

No docs changes (yet).

I converted to sets, then added the changes from @mayeut.

cibuildwheel/macos.py Outdated Show resolved Hide resolved
Co-authored-by: Matthieu Darbois <mayeut@users.noreply.github.com>
@henryiii
Copy link
Contributor Author

henryiii commented Jan 4, 2021

Any opinions? This unifies and simplifies the handling of architectures a bit, but shouldn't be controversial? Unless we want docs changes?

Copy link
Contributor

@joerick joerick left a comment

Choose a reason for hiding this comment

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

Other than the one note on unsupported archs, this looks good.

cibuildwheel/macos.py Outdated Show resolved Hide resolved
Copy link
Member

@YannickJadoul YannickJadoul left a comment

Choose a reason for hiding this comment

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

Oops, sorry, I thought I had already seen and reviewed this!

cibuildwheel/util.py Show resolved Hide resolved
joerick added a commit that referenced this pull request Jan 5, 2021
This will change when #507 is merged
@henryiii
Copy link
Contributor Author

henryiii commented Jan 5, 2021

Pulled arch checking into one place, and now they all behave the same way - specifying an empty set or an arch that's not allowed is an error.

@YannickJadoul
Copy link
Member

Pulled arch checking into one place, and now they all behave the same way

That's great.

Already approved, but ... yep, good to merge, if you ask me!

@henryiii
Copy link
Contributor Author

henryiii commented Jan 5, 2021

I didn't order the includes correctly in one place, but didn't want to rebuild after pushing so added #518 instead. I can fix it though.

Copy link
Contributor

@joerick joerick left a comment

Choose a reason for hiding this comment

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

Looks good!


import certifi

from .environment import ParsedEnvironment
from .typing import PathOrStr

if sys.version_info < (3, 8):
from typing_extensions import Literal
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, that's handy

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Everything that goes into typing that can be backported goes here. :)

@henryiii henryiii added the automerge Tells https://github.com/apps/mergery to squash-merge the PR when the button is green. label Jan 5, 2021
@probot-auto-merge probot-auto-merge bot merged commit 9f610d0 into pypa:master Jan 5, 2021
@henryiii henryiii deleted the feat/windowsfilter branch June 6, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Tells https://github.com/apps/mergery to squash-merge the PR when the button is green.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants