Skip to content
Merged
Changes from 4 commits
Commits
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
21 changes: 11 additions & 10 deletions .github/workflows/python-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ jobs:
uses: astral-sh/setup-uv@v3
with:
enable-cache: true
version: "0.8.x"
version: "0.10.x"

- name: Install Python versions
# The minimum abi3 version + pypy
run: uv python install 3.9 pypy3.10
run: uv python install 3.10 pypy3.11

- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist -i 3.9 -i pypy3.10 --manifest-path python/Cargo.toml
args: --release --out dist -i 3.10 -i pypy3.11 --manifest-path python/Cargo.toml
sccache: "true"
manylinux: ${{ matrix.platform.manylinux }}

Expand All @@ -65,9 +65,9 @@ jobs:
fail-fast: false
matrix:
platform:
- runner: macos-13
- runner: macos-15-intel
target: x86_64
- runner: macos-14
- runner: macos-15
target: aarch64
steps:
- uses: actions/checkout@v4
Expand All @@ -81,12 +81,12 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist -i 3.9 -m python/Cargo.toml
args: --release --out dist -i 3.10 -m python/Cargo.toml
sccache: "true"

- name: Install built wheel - ${{ matrix.platform.target }}
run: |
pip install geodatafusion --find-links dist --force-reinstall
pip install dist/geodatafusion-*.whl --force-reinstall
python -c "import geodatafusion"

- name: Upload wheels
Expand All @@ -105,7 +105,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.10
architecture: ${{ matrix.target }}

- uses: dtolnay/rust-toolchain@stable
Expand All @@ -114,11 +114,12 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist -i 3.9 -m python/Cargo.toml
args: --release --out dist -i 3.10 -m python/Cargo.toml

- name: Install built wheel
shell: bash
run: |
pip install geodatafusion --find-links dist --force-reinstall
pip install dist/geodatafusion-*.whl --force-reinstall
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Suggested change
pip install dist/geodatafusion-*.whl --force-reinstall
python -m pip install geodatafusion --find-links dist --force-reinstall

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I think this is probably better

Suggested change
pip install dist/geodatafusion-*.whl --force-reinstall
python -m pip install dist/geodatafusion-*.whl --force-reinstall

Then we're passing in a local path, so it will definitely grab the local file.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

python -c "import geodatafusion"

- name: Upload wheels
Expand Down
Loading