Skip to content

Commit 4e9959a

Browse files
fix: wheel building for linux, macos (#535)
1 parent 13fda1c commit 4e9959a

File tree

9 files changed

+73
-192
lines changed

9 files changed

+73
-192
lines changed

.github/action-common-python-release/action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runs:
4848
command: ${{ inputs.maturin-command }}
4949
target: ${{ inputs.maturin-target }}
5050
container: ${{ inputs.maturin-container }}
51-
args: -i ${{ inputs.python-version }} --release --manifest-path crates/python/Cargo.toml --out dist ${{ inputs.package-name == 'qcs-sdk-python-grpc-web' && '-F grpc-web' || '' }}
51+
args: -i ${{ inputs.python-version }} --release --manifest-path crates/python/Cargo.toml --out dist ${{ inputs.package-name == 'qcs-sdk-python-grpc-web' && '-F grpc-web' || '' }} --auditwheel repair -v
5252
docker-options: -e CI
5353
- if: inputs.maturin-command == 'sdist'
5454
name: Maturin - Source Distribution
@@ -61,13 +61,14 @@ runs:
6161
args: --manifest-path crates/python/Cargo.toml --out dist
6262

6363
# host will not be able to install wheel in this case
64-
- if: inputs.maturin-target != 'ppc64le'
64+
- if: inputs.maturin-target != 'ppc64le' && inputs.maturin-target != 'x86_64-apple-darwin'
6565
name: Install wheel
6666
shell: bash
6767
run: |
6868
pip install dist/* --find-links dist --force-reinstall
6969
- name: Upload wheels
7070
uses: actions/upload-artifact@v4
7171
with:
72-
name: wheels_${{ inputs.package-name }}-${{ inputs.python-version }}-${{ inputs.artifact-key }}
72+
name: wheels_${{ inputs.package-name }}-${{ inputs.python-version }}-${{ inputs.maturin-target }}-${{ inputs.artifact-key }}
7373
path: dist/
74+

.github/workflows/check-release-python.yml.disabled

Lines changed: 0 additions & 181 deletions
This file was deleted.

.github/workflows/release-python.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
matrix:
3333
package-name: [qcs-sdk-python, qcs-sdk-python-grpc-web]
3434
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
35+
target: [x86_64-apple-darwin, aarch64-apple-darwin]
3536
steps:
3637
- uses: actions/checkout@v4
3738
- name: Install protoc
@@ -44,8 +45,7 @@ jobs:
4445
artifact-key: macos
4546
package-name: ${{ matrix.package-name }}
4647
python-version: ${{ matrix.python-version }}
47-
maturin-target: universal2-apple-darwin
48-
maturin-container: ghcr.io/rust-cross/manylinux_2_28-cross:aarch64
48+
maturin-target: ${{ matrix.target }}
4949

5050
linux-x86_64:
5151
runs-on: ubuntu-latest
@@ -134,7 +134,6 @@ jobs:
134134
package-name: qcs-sdk-python-grpc-web
135135
python-version: ${{ matrix.python-version }}
136136
maturin-target: ppc64le
137-
maturin-container: ghcr.io/rust-cross/manylinux_2_28-cross:ppc64le
138137

139138
windows:
140139
runs-on: windows-latest

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/lib/CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
## 0.25.11-rc.4
2+
3+
### Fixes
4+
5+
- release seems to work
6+
- add unzip check to wheel build
7+
8+
## 0.25.11-rc.3
9+
10+
### Fixes
11+
12+
- add unzip check to wheel build
13+
14+
## 0.25.11-rc.2
15+
16+
### Fixes
17+
18+
- add unzip check to wheel build
19+
20+
## 0.25.11-rc.1
21+
22+
### Fixes
23+
24+
- add unzip check to wheel build
25+
26+
## 0.25.11-rc.0
27+
28+
### Fixes
29+
30+
- add unzip check to wheel build
31+
132
## 0.25.10
233

334
### Fixes

crates/lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "qcs"
33
description = "High level interface for running Quil on a QPU"
4-
version = "0.25.10"
4+
version = "0.25.11-rc.4"
55
edition = "2018"
66
license = "Apache-2.0"
77
repository = "https://github.com/rigetti/qcs-sdk-rust"

crates/python/CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
## 0.21.12-rc.4
2+
3+
### Fixes
4+
5+
- release seems to work
6+
- add unzip check to wheel build
7+
8+
## 0.21.12-rc.3
9+
10+
### Fixes
11+
12+
- add unzip check to wheel build
13+
14+
## 0.21.12-rc.2
15+
16+
### Fixes
17+
18+
- add unzip check to wheel build
19+
20+
## 0.21.12-rc.1
21+
22+
### Fixes
23+
24+
- add unzip check to wheel build
25+
26+
## 0.21.12-rc.0
27+
28+
### Fixes
29+
30+
- add unzip check to wheel build
31+
132
## 0.21.11
233

334
### Fixes

crates/python/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "qcs-sdk-python"
33
description = "Python bindings to qcs-sdk-rust"
4-
version = "0.21.11"
4+
version = "0.21.12-rc.4"
55
edition = "2021"
66
license = "Apache-2.0"
77
repository = "https://github.com/rigetti/qcs-sdk-rust"

crates/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is the metadata Maturin uploads to PyPI on publish
22
[project]
33
name = "qcs-sdk-python"
4-
version = "0.21.11"
4+
version = "0.21.12-rc.4"
55
description = "Python interface for the QCS Rust SDK"
66
readme = "README.md"
77
license = { text = "Apache-2.0" }

0 commit comments

Comments
 (0)