-
Notifications
You must be signed in to change notification settings - Fork 209
add support for free-threaded wheels #955
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
57baaaa
add support for free-threaded wheels
ngoldbaum cd4660f
go back to using python.org installer directly
ngoldbaum 28fd201
replace variable cribbed from elsewhere with the python version
ngoldbaum 416e49f
Merge branch 'main' into free-threaded-wheels
ngoldbaum 5741619
apply code review suggestions
ngoldbaum 20de380
move plist file to .github/config
ngoldbaum 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
14 changes: 14 additions & 0 deletions
14
.github/workflows/config/macos-pkg-choices-freethreaded.xml
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <array> | ||
| <dict> | ||
| <key>attributeSetting</key> | ||
| <integer>1</integer> | ||
| <key>choiceAttribute</key> | ||
| <string>selected</string> | ||
| <key>choiceIdentifier</key> | ||
| <string>org.python.Python.PythonTFramework-3.13</string> | ||
| </dict> | ||
| </array> | ||
| </plist> | ||
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 |
|---|---|---|
|
|
@@ -50,6 +50,7 @@ jobs: | |
| - { VERSION: "cp38-cp38", ABI_VERSION: 'cp38' } | ||
| - { VERSION: "cp39-cp39", ABI_VERSION: 'cp39' } | ||
| - { VERSION: "pp310-pypy310_pp73" } | ||
| - { VERSION: "cp313-cp313t" } | ||
| MANYLINUX: | ||
| - { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest" } | ||
| - { NAME: "manylinux_2_28_x86_64", CONTAINER: "cryptography-manylinux_2_28:x86_64", RUNNER: "ubuntu-latest"} | ||
|
|
@@ -139,18 +140,33 @@ jobs: | |
| ABI_VERSION: 'cp39' | ||
| DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg' | ||
| BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.11/bin/python3' | ||
| name: "Python ${{ matrix.PYTHON.VERSION }} for ABI ${{ matrix.PYTHON.ABI_VERSION }} on macOS" | ||
| - VERSION: '3.13t' | ||
| DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg' | ||
| BIN_PATH: '/Library/Frameworks/PythonT.framework/Versions/3.13/bin/python3.13t' | ||
| name: "Python ${{ matrix.PYTHON.VERSION }} ${{ matrix.PYTHON.ABI_VERSION }} on macOS" | ||
| steps: | ||
| - run: | | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| with: | ||
| # The tag to build or the tag received by the tag event | ||
| ref: ${{ github.event.inputs.version || github.ref }} | ||
| persist-credentials: false | ||
ngoldbaum marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - name: Install Python | ||
| if: matrix.PYTHON.VERSION != '3.13t' | ||
| run: | | ||
| curl "${{ matrix.PYTHON.DOWNLOAD_URL }}" -o python.pkg | ||
| sudo installer -pkg python.pkg -target / | ||
| - name: Install Python | ||
| if: matrix.PYTHON.VERSION == '3.13t' | ||
| run: | | ||
| curl "${{ matrix.PYTHON.DOWNLOAD_URL }}" -o python.pkg | ||
| sudo installer -pkg python.pkg -applyChoiceChangesXML .github/workflows/config/macos-pkg-choices-freethreaded.xml -target / | ||
| - uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203 | ||
| with: | ||
| toolchain: stable | ||
| # Add the arm64 target in addition to the native arch (x86_64) | ||
| target: aarch64-apple-darwin | ||
|
|
||
| - run: ${{ matrix.PYTHON.BIN_PATH }} -m venv venv | ||
| - run: python -m venv venv | ||
ngoldbaum marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - run: venv/bin/pip install -U pip wheel setuptools-rust | ||
| - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 | ||
| with: | ||
|
|
@@ -190,13 +206,14 @@ jobs: | |
| PYTHON: | ||
| - {VERSION: "3.11", ABI_VERSION: "cp38"} | ||
| - {VERSION: "3.11", ABI_VERSION: "cp39"} | ||
| - {VERSION: "3.13t"} | ||
| name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.PYTHON.ABI_VERSION }} ${{ matrix.WINDOWS.ARCH }}" | ||
| steps: | ||
| - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 | ||
| with: | ||
| name: bcrypt-sdist | ||
| - name: Setup python | ||
| uses: actions/[email protected].0 | ||
| uses: quansight-labs/[email protected].1 | ||
| with: | ||
| python-version: ${{ matrix.PYTHON.VERSION }} | ||
| architecture: ${{ matrix.WINDOWS.ARCH }} | ||
|
|
||
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.
Ooops, sorry should have caught this before: can you this to
.github/config/macos-pkg-choices-freethreaded.xml(i.e. not inworkflows)?