Skip to content

fix: rename gp242 identifier to gp311_242 #2411

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

Merged
merged 2 commits into from
May 26, 2025
Merged

Conversation

mayeut
Copy link
Member

@mayeut mayeut commented May 25, 2025

fixes #2410

This normalises identifiers to always start with {impl}{pyver}. It's one way of fixing #2410
The rationale behind this solution is while there's only one python version supported by GraalPy for a given version, if PyPy starts to ship a new ABI, we'll probably end-up using pp311_{ABI_VERSION} and identifiers will be consistent in between PyPy & GraalPy even if a bit more verbose than needed for GraalPy.

@mayeut
Copy link
Member Author

mayeut commented May 25, 2025

cc @timfel

@mayeut mayeut added the CI: GraalPy Run the integration test suite with GraalPy included label May 25, 2025
@@ -147,7 +147,11 @@ def update_version(self, identifier: str, spec: Specifier) -> AnyConfig:
msg = f"{identifier} not supported yet on GraalPy"
raise RuntimeError(msg)

gpspec_str = identifier.split("-")[0].split("_")[1]
gpspec = Specifier("==24.2.*") if gpspec_str == "242" else Specifier(f"=={gpspec_str}.*")
Copy link
Member Author

Choose a reason for hiding this comment

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

this is likely to need an update once a new GraalPy version is released

@joerick
Copy link
Contributor

joerick commented May 25, 2025

Nice catch. This solution makes sense to me.

@timfel
Copy link
Contributor

timfel commented May 26, 2025

Looks good to me as well. I took a note to update the update_pythons.py script when we move to 25

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.

Just missing the update to the table at https://cibuildwheel.pypa.io/en/latest/options/#build-skip

(i added the row in a parallel PR)

@henryiii
Copy link
Contributor

Yes, I noticed that too. Should we merge this and then update in the parallel PR?

@henryiii
Copy link
Contributor

Oh, I think I see what you mean, okay, I can update it.

mayeut and others added 2 commits May 26, 2025 12:19
fixes pypa#2410

This normalises identifiers to always start with `{impl}{pyver}`.
It's one way of fixing pypa#2410
The rationale behind this solution is while there's only one python version supported by GraalPy for a given version, if PyPy starts to ship a new ABI, we'll probably end-up using `pp311_{ABI_VERSION}` and identifiers will be consistent in between PyPy & GraalPy even if a bit more verbose than needed for GraalPy.
Signed-off-by: Henry Schreiner <[email protected]>
@henryiii henryiii merged commit 2d6b40d into pypa:main May 26, 2025
28 checks passed
@mayeut mayeut deleted the rework-selector branch May 29, 2025 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: GraalPy Run the integration test suite with GraalPy included
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using requires_python skips GraalPy identifiers
4 participants