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.

Sign up for GitHub

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

Jump to bottom

Fix Python macos x86 build #178

Merged
merged 14 commits into from
Aug 20, 2024
Merged

Fix Python macos x86 build #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
431f0d9
Add x86_64 target.
mlondschien Aug 20, 2024
ac6c776
try to fix sdist.
mlondschien Aug 20, 2024
196f34d
Add x86 target also for universal2.
mlondschien Aug 20, 2024
6eb95ab
-b pyo3
mlondschien Aug 20, 2024
08e2edf
Move bindings def into pyproject.toml
mlondschien Aug 20, 2024
bfd52cb
skip 313 in universal2.
mlondschien Aug 20, 2024
24f90fe
Skip universal2 alltogether.
mlondschien Aug 20, 2024
91eab45
Use maturin build --sdist instead of maturin sdist.
mlondschien Aug 20, 2024
3e69120
Bump pyo3 to 0.22
mlondschien Aug 20, 2024
8f7d0f6
Try pyo3 maturin-action.
mlondschien Aug 20, 2024
be08ba4
Bump numpy=0.22 as well.
mlondschien Aug 20, 2024
d91d294
Revert to 0.19
mlondschien Aug 20, 2024
801ba4f
Pass --bindings pyo3 to pyo3/maturin-action
mlondschien Aug 20, 2024
e9859e8
Revert sdist changes.
mlondschien Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ jobs:
os: macos-latest
- vers: x86_64
os: macos-latest
- vers: universal2
os: macos-latest

- vers: AMD64
os: windows-2019
Expand All @@ -56,9 +54,13 @@ jobs:
platforms: arm64

- name: Install darwin target for apple silicon
if: matrix.vers == 'universal2' || (matrix.vers == 'arm64' && matrix.os == 'macos-latest')
if: matrix.vers == 'arm64' && matrix.os == 'macos-latest'
run: rustup target add aarch64-apple-darwin

- name: Install target for apple x86
if: matrix.os == 'macos-latest' && matrix.vers == 'x86_64'
run: rustup target add x86_64-apple-darwin

- name: Setup env when not using docker
if: runner.os != 'Linux'
run: |
Expand Down Expand Up @@ -90,6 +92,7 @@ jobs:

- name: Install build dependencies
run: python -m pip install numpy maturin

- name: Build sdist
run: maturin sdist -m changeforest-py/Cargo.toml

Expand Down
3 changes: 3 additions & 0 deletions changeforest-py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ classifiers = [
requires = ["maturin>=1.0,<2.0"]
build-backend = "maturin"

[tool.maturin]
bindings = "pyo3"

[tool.isort]
multi_line_output = 3
include_trailing_comma = true
Expand Down
Loading