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

ci: remove workaround for free-threaded build w. maturin #172

Merged
merged 10 commits into from
Dec 2, 2024
Merged

ci: remove workaround for free-threaded build w. maturin #172

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71916e2
ci: remove workaround for free-threaded build w. maturin
davidhewitt Nov 26, 2024
60b007c
use `python3.13t` as interpreter in maturin build
davidhewitt Nov 26, 2024
e4fce79
move workaround directly to maturin args
davidhewitt Nov 26, 2024
8463b25
debug maturin (windows build failing to understand platform)
davidhewitt Nov 26, 2024
fbee870
Revert "skip Windows free-threaded wheel build for now (#173)"
davidhewitt Nov 26, 2024
2fd43cf
use git branch of maturin for testing
davidhewitt Nov 26, 2024
f4451ad
remove interpreter workaround
davidhewitt Nov 28, 2024
afea1e9
revert git maturin
davidhewitt Nov 28, 2024
e1da808
disable twine for now
davidhewitt Dec 2, 2024
8084e37
remove maturin debug logging
davidhewitt Dec 2, 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
33 changes: 7 additions & 26 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ jobs:

- run: |
pip install -U twine
twine check --strict crates/jiter-python/dist/*
# FIXME: restore `twine` check when metadata version 2.4 (used by `maturin`) supported by `twine`,
# see https://github.com/pypa/twine/pull/1180
# twine check --strict crates/jiter-python/dist/*

- uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -362,10 +364,6 @@ jobs:
interpreter: "3.8"
- os: macos
interpreter: "3.9"
# windows free-threaded build has a problematic wheel name,
# needs something like https://github.com/PyO3/maturin/pull/2325 to fix
- os: windows
interpreter: "3.13t"

runs-on: ${{ matrix.runs-on }}
steps:
Expand All @@ -384,29 +382,10 @@ jobs:
with:
components: llvm-tools

# linux: builds are done inside manylinux docker images, need to help maturin-action
# find the right path
#
# TODO, would be nice to remove, see
# https://github.com/PyO3/maturin-action/issues/300
- if: ${{ matrix.os == 'linux' }}
id: resolve-interpreter
name: resolve interpreter
run: |
echo python-path=/opt/python/$(python -c "print({
'3.8': 'cp38-cp38',
'3.9': 'cp39-cp39',
'3.10': 'cp310-cp310',
'3.11': 'cp311-cp311',
'3.12': 'cp312-cp312',
'3.13': 'cp313-cp313',
'3.13t': 'cp313-cp313t',
}['${{ matrix.interpreter }}'])")/bin/python >> $GITHUB_OUTPUT

- name: build pgo wheel
uses: ./.github/actions/build-pgo-wheel
with:
interpreter: ${{ matrix.os == 'linux' && steps.resolve-interpreter.outputs.python-path || steps.setup-python.outputs.python-path }}
interpreter: ${{ matrix.interpreter }}
rust-toolchain: ${{ steps.rust-toolchain.outputs.name }}

- run: ${{ matrix.ls || 'ls -lh' }} crates/jiter-python/dist/
Expand Down Expand Up @@ -584,7 +563,9 @@ jobs:

- run: pip install -U twine
- run: ls -l dist/
- run: twine check --strict dist/*
# FIXME: restore `twine` check when metadata version 2.4 (used by `maturin`) supported by `twine`
# see https://github.com/pypa/twine/pull/1180
# - run: twine check --strict dist/*

- name: upload to pypi
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
Loading