-
Notifications
You must be signed in to change notification settings - Fork 5
ci: build python wheels for more python versions and x86 macos architectures #1183
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
Open
Taepper
wants to merge
5
commits into
main
Choose a base branch
from
1174-more-python-platforms
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+57
−63
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
706d3ed
ci: reuse build/Release as build directory for python bindings
Taepper 4de1997
ci: no longer explicitly specify conan directory
Taepper 73dbc7b
ci: build python wheels for more python versions and x86 macos archit…
Taepper 27c57df
fixup! ci: build python wheels for more python versions and x86 macos…
Taepper 6f6ccd9
fixup! ci: build python wheels for more python versions and x86 macos…
Taepper File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,58 +60,41 @@ def _run_cmake(self): | |
| # The directory containing this setup.py | ||
| source = os.path.dirname(os.path.abspath(__file__)) | ||
|
|
||
| # Get setuptools build directories (following Arrow's pattern) | ||
| # Get setuptools build directories | ||
| build_cmd = self.get_finalized_command('build') | ||
| saved_cwd = os.getcwd() | ||
| build_temp = pjoin(saved_cwd, build_cmd.build_temp) | ||
| build_lib = pjoin(saved_cwd, build_cmd.build_lib) | ||
|
|
||
| if not os.path.isdir(build_temp): | ||
| self.mkpath(build_temp) | ||
|
|
||
| # Install directly to setuptools' build_lib directory | ||
| # This way setuptools finds the files without manual copying | ||
| install_prefix = pjoin(build_lib, "silodb") | ||
|
|
||
| # Configuration name (e.g., Debug, Release) | ||
| config_name = self.build_type.capitalize() | ||
|
|
||
| # Change to the build_temp directory | ||
| with changed_dir(build_temp): | ||
| # Find existing conan generators directory | ||
| # Try build/{config_name}/generators first, then build/{other_config}/generators | ||
| conan_generators_dir = None | ||
| for config in [config_name, 'Release', 'Debug']: | ||
| candidate = pjoin(source, "build", config, "generators") | ||
| if os.path.exists(candidate): | ||
| conan_generators_dir = candidate | ||
| break | ||
|
|
||
| if not conan_generators_dir: | ||
| raise RuntimeError( | ||
| "Conan dependencies not found. Please run the following first:\n" | ||
| f" mkdir -p build/{config_name} && cd build/{config_name}\n" | ||
| " conan install ../..\n" | ||
| " cmake ../.. -DBUILD_PYTHON_BINDINGS=OFF\n" | ||
| " cmake --build .\n" | ||
| "Then retry: pip install ." | ||
| ) | ||
|
|
||
| print(f"-- Using conan dependencies from {conan_generators_dir}") | ||
| # Reuse the existing cmake build directory (populated by `make dependencies`) | ||
| # so that silolib is not recompiled for each Python version | ||
| build_dir = pjoin(source, "build", config_name) | ||
|
|
||
| if not os.path.isdir(build_dir): | ||
| self.mkpath(build_dir) | ||
|
|
||
| # Change to the build_dir directory | ||
| with changed_dir(build_dir): | ||
| # --- CONFIGURE --- | ||
| cmake_options = [ | ||
| f'-DCMAKE_INSTALL_PREFIX={install_prefix}', | ||
| f'-DPython3_EXECUTABLE={sys.executable}', | ||
| # Explicitly provide include dir so CMake finds headers for | ||
| # python-build-standalone installs (used by uv) on Linux | ||
| f'-DPython3_INCLUDE_DIR={sysconfig.get_path("include")}', | ||
| f'-DCMAKE_BUILD_TYPE={config_name}', | ||
| f'-DCMAKE_PREFIX_PATH={conan_generators_dir}', | ||
| f'-DCMAKE_MODULE_PATH={conan_generators_dir}', | ||
| '-DBUILD_PYTHON_BINDINGS=ON', | ||
| # var ignored on other OSs | ||
| '-DCMAKE_OSX_DEPLOYMENT_TARGET=15.0', | ||
| ] | ||
|
|
||
| print(f"-- Running cmake to configure project in {build_temp}") | ||
| print(f"-- Running cmake to configure project in {build_dir}") | ||
| print(f"-- Will install to: {install_prefix}") | ||
| self.spawn(['cmake'] + cmake_options + [source]) | ||
|
Comment on lines
+75
to
99
|
||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Setting CMAKE_OSX_DEPLOYMENT_TARGET to 15.0 will make the wheels only compatible with macOS 15 Sequoia and later. This is quite restrictive and excludes users on macOS 14, 13, and earlier versions. Consider lowering this to a more widely compatible version like 11.0 or 12.0 to maximize compatibility across different macOS versions, especially for x86_64 builds which typically support older hardware. The comment says the var is "ignored on other OSs" but doesn't justify why 15.0 is required for macOS.