Set Correct Platform Tag in Wheels on Mac OS with Python 3.10#29857
Merged
gnossen merged 23 commits intogrpc:masterfrom Jun 15, 2022
Merged
Set Correct Platform Tag in Wheels on Mac OS with Python 3.10#29857gnossen merged 23 commits intogrpc:masterfrom
gnossen merged 23 commits intogrpc:masterfrom
Conversation
sergiitk
approved these changes
Jun 15, 2022
gnossen
added a commit
to gnossen/grpc
that referenced
this pull request
Jun 15, 2022
…9857) * Attempt to set correct platform on Mac OS * Add some debug * Make it fail * Print more * Try again * Maybe it's an ordering issue? * Get logs back * Try copying distutils to see exactly what is being used * Actually export the variable * I just love debugging with CI * One directory higher this time * Try with an upgraded Python install * Fix version * Rebreak * Try setting it even earlier? * Unbreak * Try explicitly renaming the artifacts * Fix * I am about ready to start NAT hole punching for SSH * Break things for logs * Whoops * Clean up * Shellcheck
gnossen
added a commit
that referenced
this pull request
Jun 15, 2022
#30026) * Attempt to set correct platform on Mac OS * Add some debug * Make it fail * Print more * Try again * Maybe it's an ordering issue? * Get logs back * Try copying distutils to see exactly what is being used * Actually export the variable * I just love debugging with CI * One directory higher this time * Try with an upgraded Python install * Fix version * Rebreak * Try setting it even earlier? * Unbreak * Try explicitly renaming the artifacts * Fix * I am about ready to start NAT hole punching for SSH * Break things for logs * Whoops * Clean up * Shellcheck
Contributor
Author
|
Yes. I'm expecting expecting a release candidate later today (pacific time) and 1.47.0 will follow in a couple of days. |
Closed
2 tasks
yashykt
added a commit
that referenced
this pull request
Jul 1, 2022
* Bump version to 1.47.0-pre1 (on v1.47.x branch) (#29830) * bump version to 1.47.0-pre1 * regenerate projects * xDS: Workaround to get gRPC clients working with istio (#29841) (#29850) * xDS: Workaround to get gRPC clients working with istio * Formatting * Comment test too * Disable instead of commenting * Support for prebuilt Ruby binary on x64-mingw-ucrt platform (#29684) (#29868) * Add support for prebuilt Ruby binary on x64-mingw-ucrt platform, which is used for Windows RubyInstaller Ruby 3.1+ Co-authored-by: Johnny Shields <johnny.shields@gmail.com> * use constraints value in @platforms instead of @bazel_tools//platforms bazelbuild/bazel#8622 (#30019) * Set Correct Platform Tag in Wheels on Mac OS with Python 3.10 (#29857) (#30026) * Attempt to set correct platform on Mac OS * Add some debug * Make it fail * Print more * Try again * Maybe it's an ordering issue? * Get logs back * Try copying distutils to see exactly what is being used * Actually export the variable * I just love debugging with CI * One directory higher this time * Try with an upgraded Python install * Fix version * Rebreak * Try setting it even earlier? * Unbreak * Try explicitly renaming the artifacts * Fix * I am about ready to start NAT hole punching for SSH * Break things for logs * Whoops * Clean up * Shellcheck * xds-k8s jobs: standardize TESTING_VERSION (#30027) (#30048) This Addresses the issue with skips not working in golang tests, ref b/235688697. 1. Unifies `TESTING_VERSION` detection in grpc_xds_k8s_install_test_driver.sh - new approach applicable to all languages. 2. Use `TESTING_VERSION` in all build files in `--testing_version` and when tagging docker images. This will be backported to all active test branches. Build Scripts in all other languages will be updated as well. * Bump Release Version to 1.47.0 (#30073) * bump version to 1.47.0 * regenerate projects * Using string rep for status-time (#30123) (#30145) * tell MSVC to build grpc with utf-8 (#30003) (#30153) * tell MSVC to build grpc with utf-8 fix #29979 * generate_projects Co-authored-by: AJ Heller <hork@google.com> Co-authored-by: AJ Heller <hork@google.com> Co-authored-by: Richard Belleville <rbellevi@google.com> Co-authored-by: apolcyn <apolcyn@google.com> Co-authored-by: Johnny Shields <johnny.shields@gmail.com> Co-authored-by: Ara Nguyen <91614797+aranguyen@users.noreply.github.com> Co-authored-by: Sergii Tkachenko <sergiitk@google.com> Co-authored-by: Esun Kim <veblush@google.com> Co-authored-by: hongnod <6680267+hongnod@users.noreply.github.com> Co-authored-by: AJ Heller <hork@google.com>
This was referenced Nov 22, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Intended to fix #28387
After much experimentation (seriously, look at the commit history), I found that the "ARCHFLAGS" approach just wasn't working. Instead, I simply rename the artifact. This has been tested to work on an M1 mac running with Rosetta.
This is a hack. Long term, we'll need to figure out why
distutilsis not generating the proper platform and fix that. We'll also want to generate botharm64artifacts and a properuniversal2artifact containing both x64 and arm64 artifacts. However, this will unbreak M1 users in the short term.Side note: This PR also updates the Python 3.10 patch version installed on MacOS.