Skip to content

Fix windows 3.13t wheels #50

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

Merged
merged 19 commits into from
Jan 3, 2025
Merged

Fix windows 3.13t wheels #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
568b2cf
Pin runner images
ddelange Dec 24, 2024
d4db26f
Add LIBPATH variable
ddelange Dec 24, 2024
ce73691
Another windows fix attempt
ddelange Dec 24, 2024
1cba10f
Avoid duplicate runs on PR
ddelange Dec 24, 2024
83374d4
Avoid duplicate tests runs on PRs
ddelange Dec 24, 2024
7e238c0
Disable 3.13t on windows
ddelange Dec 24, 2024
3656139
Fix syntax
ddelange Dec 24, 2024
a289610
Remove generate-import-lib
ddelange Dec 25, 2024
d5c17b4
Add python 3.8 to the runner
ddelange Dec 25, 2024
5d1d017
Split out builds to individual python versions
ddelange Dec 25, 2024
83d47ec
Allow 3.13t in setup-python
ddelange Dec 25, 2024
22f0195
Fix matrix
ddelange Dec 25, 2024
21a152a
Fix matrix
ddelange Dec 25, 2024
86876d5
Revert matrix
ddelange Dec 25, 2024
30a1472
Add comments
ddelange Dec 25, 2024
8fc1f79
Pin maturin action
ddelange Dec 29, 2024
2ef5f0a
Add cargo to dependabot.yml
ddelange Dec 29, 2024
6d307a8
Bump dependencies in Cargo.toml
ddelange Dec 29, 2024
ecc58c1
Update tests status badge
ddelange Dec 29, 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
8 changes: 4 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ updates:
directory: /
schedule:
interval: monthly
groups:
github-actions:
patterns:
- '*'
- package-ecosystem: cargo
directory: /
schedule:
interval: monthly
76 changes: 50 additions & 26 deletions .github/workflows/dists.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: dists
on:
pull_request:
push:
branches: '**' # not tags
branches: [master]
Copy link
Owner

Choose a reason for hiding this comment

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

I do like being able to run CI on my branches without creating a PR. Does the '**' setting cause any problems?

Copy link
Collaborator Author

@ddelange ddelange Jan 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

the setting causes duplicate jobs for every commit pushed to a PR. i think what you're looking for is on: workflow_dispatch. we already added it in a previous PR: it adds a Run Workflow button on the right hand side here, where you can run CI manually on any branch without creating a PR

Copy link
Owner

Choose a reason for hiding this comment

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

Got it.

release:
types: [released, prereleased]
workflow_dispatch: # allows running workflow manually from the Actions tab
Expand All @@ -14,58 +14,82 @@ concurrency: # https://stackoverflow.com/questions/66335225#comment133398800_72

jobs:
wheel:
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux || 'auto' }}
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux }}
strategy:
fail-fast: false
matrix:
include:
- { os: macos-latest, target: x86_64 }
- { os: macos-latest, target: aarch64 }
- { os: ubuntu-latest, target: x86_64 }
- { os: ubuntu-latest, target: aarch64 }
- { os: ubuntu-latest, target: i686 }
- { os: ubuntu-latest, target: armv7 }
- { os: ubuntu-latest, target: ppc64le }
- { os: ubuntu-latest, target: s390x }
- { os: ubuntu-latest, target: x86_64, manylinux: musllinux_1_1 }
- { os: ubuntu-latest, target: aarch64, manylinux: musllinux_1_1 }
- { os: windows-latest, target: x86_64 }
- { os: windows-latest, target: i686 }
- { os: macos-15, target: x86_64, manylinux: auto}
- { os: macos-15, target: aarch64, manylinux: auto}
- { os: ubuntu-24.04, target: x86_64, manylinux: auto}
- { os: ubuntu-24.04, target: aarch64, manylinux: auto}
- { os: ubuntu-24.04, target: i686, manylinux: auto}
- { os: ubuntu-24.04, target: armv7, manylinux: auto}
- { os: ubuntu-24.04, target: ppc64le, manylinux: auto}
- { os: ubuntu-24.04, target: s390x, manylinux: auto}
- { os: ubuntu-24.04, target: x86_64, manylinux: musllinux_1_1 }
- { os: ubuntu-24.04, target: aarch64, manylinux: musllinux_1_1 }
- { os: windows-2025, target: x86_64, manylinux: auto}
- { os: windows-2025, target: i686, manylinux: auto}

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

# keep python versions in sync with tests.yml
# all python versions need to be present for linking to succeed
- uses: actions/setup-python@v5
with:
# pin to the latest supported python version
python-version: "3.13"
# x86 python needs to be available for the win32 wheel
architecture: ${{ ( matrix.os == 'windows-latest' && matrix.target == 'i686' ) && 'x86' || null }}
python-version: '3.8'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: actions/setup-python@v5
with:
python-version: '3.11'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: actions/setup-python@v5
with:
python-version: '3.12'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: actions/setup-python@v5
with:
python-version: '3.13'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}
- uses: Quansight-Labs/setup-python@v5 # 3.13t support not yet merged ref https://github.com/actions/setup-python/pull/973#issuecomment-2495900996
with:
python-version: '3.13t'
architecture: ${{ ( startsWith(matrix.os, 'windows') && matrix.target == 'i686' ) && 'x86' || null }}

- uses: PyO3/maturin-action@v1
- uses: PyO3/maturin-action@v1.45.0
with:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux || 'auto' }}
# Keep in sync with tests.yml
manylinux: ${{ matrix.manylinux }}
Copy link
Owner

Choose a reason for hiding this comment

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

Just so I follow, what's the reason for this change?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ah I was experimenting with furthet breaking up the matrix, one Python version at a time. To keep that simple, I wrote out the full matrix, including the auto string. Ended up reverting, but decided to keep this one.

# keep python versions in sync with tests.yml
args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 3.13t'
rust-toolchain: stable
docker-options: -e CI

- run: ${{ (matrix.os == 'windows-latest' && 'dir') || 'ls -ltra' }} dist/
- run: ${{ (startsWith(matrix.os, 'windows') && 'dir') || 'ls -ltra' }} dist/

- uses: actions/upload-artifact@v4
with:
name: dist-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux || 'auto' }}
name: dist-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux }}
path: dist

sdist:
name: sdist
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- uses: PyO3/maturin-action@v1
- uses: PyO3/maturin-action@v1.45.0
with:
command: sdist
args: --out dist
Expand All @@ -79,7 +103,7 @@ jobs:
publish:
if: github.event_name == 'release'
needs: [wheel, sdist]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

permissions:
contents: write # softprops/action-gh-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: tests
on:
pull_request:
push:
branches: '**' # not tags
branches: [master]
workflow_dispatch: # allows running workflow manually from the Actions tab

concurrency: # https://stackoverflow.com/questions/66335225#comment133398800_72408109
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ crate-type = ["cdylib"]
neon = ["blake3/neon"]

[dependencies]
blake3 = { version = "1.5", features = ["mmap", "rayon"] }
hex = "0.4.2"
pyo3 = { version = "0.23.3", features = ["extension-module", "generate-import-lib"] }
rayon = "1.2.1"
blake3 = { version = "1.5.5", features = ["mmap", "rayon"] }
hex = "0.4.3"
pyo3 = { version = "0.23.3", features = ["extension-module"] }
rayon = "1.10.0"
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# blake3-py [![Actions Status](https://github.com/oconnor663/blake3-py/workflows/tests/badge.svg)](https://github.com/oconnor663/blake3-py/actions) [![PyPI version](https://badge.fury.io/py/blake3.svg)](https://pypi.python.org/pypi/blake3)
# blake3-py [![tests](https://github.com/oconnor663/blake3-py/actions/workflows/tests.yml/badge.svg?branch=master&event=push)](https://github.com/oconnor663/blake3-py/actions/workflows/tests.yml) [![PyPI version](https://badge.fury.io/py/blake3.svg)](https://pypi.python.org/pypi/blake3)

Python bindings for the [official Rust implementation of
BLAKE3](https://github.com/BLAKE3-team/BLAKE3), based on
Expand Down
Loading