Skip to content

Commit c73524e

Browse files
maxb2david.kotval
andauthored
Fix: wheel builds (#1)
This updates the manylinux version because manylinux2014 only supports [email protected] where libgssapi requires clang>=3.9. manylinux_2_28 supports clang@14 solving a lot of issues. This also updates maturin to fix a panic while auditing the built wheel. FWIW, manylinux2014 is EOL June 30th, 2024 so this change needs to happen soon anyway. --------- Co-authored-by: david.kotval <[email protected]>
1 parent 241c1c1 commit c73524e

File tree

4 files changed

+29
-32
lines changed

4 files changed

+29
-32
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install tools
2020
run: |
2121
apt-get update
22-
apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev
22+
apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libkrb5-dev libclang-dev
2323
env:
2424
DEBIAN_FRONTEND: noninteractive
2525

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install tools
5959
run: |
6060
apt-get update
61-
apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66
61+
apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
6262
pip3 install mssql-cli
6363
pip3 install cli-helpers==2.2.0
6464
ln -s /usr/bin/python3 /usr/bin/python
@@ -181,7 +181,7 @@ jobs:
181181
- name: Install tools
182182
run: |
183183
apt-get update
184-
apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev python3 python3-pip libicu66
184+
apt-get install -y curl postgresql-client build-essential python3-dev python3-pip pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev python3 python3-pip libicu66 libkrb5-dev libclang-dev
185185
pip3 install mssql-cli
186186
pip3 install cli-helpers==2.2.0
187187
ln -s /usr/bin/python3 /usr/bin/python

.github/workflows/release.yml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
linux:
1111
runs-on: ubuntu-latest
12-
container: quay.io/pypa/manylinux2014_x86_64
12+
container: quay.io/pypa/manylinux_2_28_x86_64
1313
strategy:
1414
matrix:
1515
python-version: [[38, "3.8"], [39, "3.9"], [310, "3.10"], [311, "3.11"]]
@@ -18,11 +18,7 @@ jobs:
1818

1919
- name: Set python version
2020
run: |
21-
if [[ "${{ matrix.python-version[0] }}" == "37" ]]; then
22-
echo "/opt/python/cp37-cp37m/bin" >> $GITHUB_PATH
23-
else
24-
echo "/opt/python/cp${{ matrix.python-version[0] }}-cp${{ matrix.python-version[0] }}/bin" >> $GITHUB_PATH
25-
fi
21+
echo "/opt/python/cp${{ matrix.python-version[0] }}-cp${{ matrix.python-version[0] }}/bin" >> $GITHUB_PATH
2622
2723
- uses: actions-rs/toolchain@v1
2824
with:
@@ -39,18 +35,19 @@ jobs:
3935

4036
- name: Install tools
4137
run: |
42-
yum install -y mysql-devel postgresql-devel freetds-devel
38+
yum install -y epel-release
39+
yum install -y mysql-devel postgresql-devel freetds-devel krb5-libs clang-devel
4340
4441
- name: Setup project
4542
run: |
4643
just bootstrap-python
4744
48-
- uses: messense/maturin-action@v1
45+
- uses: PyO3/maturin-action@v1
4946
with:
5047
rust-toolchain: 1.65.0
51-
maturin-version: v0.12.1
48+
maturin-version: v0.14.15
5249
command: build
53-
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
50+
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
5451
env:
5552
SQLITE3_STATIC: 1
5653

@@ -59,20 +56,20 @@ jobs:
5956
cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
6057
6158
# rebuild the wheel to incorporate j4rs dependencies
62-
- uses: messense/maturin-action@v1
59+
- uses: PyO3/maturin-action@v1
6360
with:
6461
rust-toolchain: 1.65.0
65-
maturin-version: v0.12.1
62+
maturin-version: v0.14.15
6663
command: build
67-
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
64+
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
6865
env:
6966
SQLITE3_STATIC: 1
7067

71-
# - uses: messense/maturin-action@v1
68+
# - uses: PyO3/maturin-action@v1
7269
# with:
73-
# maturin-version: v0.12.1
70+
# maturin-version: v0.14.15
7471
# command: build
75-
# args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --no-sdist --release --manylinux 2014
72+
# args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28
7673
# env:
7774
# SQLITE3_STATIC: 1
7875

@@ -115,12 +112,12 @@ jobs:
115112
run: |
116113
just bootstrap-python
117114
118-
- uses: messense/maturin-action@v1
115+
- uses: PyO3/maturin-action@v1
119116
with:
120117
rust-toolchain: 1.65.0
121-
maturin-version: v0.12.1
118+
maturin-version: v0.14.15
122119
command: build
123-
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
120+
args: -m connectorx-python/Cargo.toml -i python --release
124121
env:
125122
SQLITE3_STATIC: 1
126123

@@ -129,12 +126,12 @@ jobs:
129126
cp -r connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
130127
131128
# rebuild the wheel to incorporate j4rs dependencies
132-
- uses: messense/maturin-action@v1
129+
- uses: PyO3/maturin-action@v1
133130
with:
134131
rust-toolchain: 1.65.0
135-
maturin-version: v0.12.1
132+
maturin-version: v0.14.15
136133
command: build
137-
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
134+
args: -m connectorx-python/Cargo.toml -i python --release
138135
env:
139136
SQLITE3_STATIC: 1
140137

@@ -176,12 +173,12 @@ jobs:
176173
run: |
177174
just bootstrap-python
178175
179-
- uses: messense/maturin-action@v1
176+
- uses: PyO3/maturin-action@v1
180177
with:
181178
rust-toolchain: 1.65.0
182-
maturin-version: v0.12.1
179+
maturin-version: v0.14.15
183180
command: build
184-
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release
181+
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
185182
env:
186183
SQLITE3_STATIC: 1
187184

@@ -190,12 +187,12 @@ jobs:
190187
cp -rf connectorx-python/target/aarch64-apple-darwin/release/jassets connectorx-python/connectorx/dependencies
191188
192189
# rebuild the wheel to incorporate j4rs dependencies
193-
- uses: messense/maturin-action@v1
190+
- uses: PyO3/maturin-action@v1
194191
with:
195192
rust-toolchain: 1.65.0
196-
maturin-version: v0.12.1
193+
maturin-version: v0.14.15
197194
command: build
198-
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release
195+
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
199196
env:
200197
SQLITE3_STATIC: 1
201198

scripts/python-helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def main() -> None:
6161
else:
6262
abitag = pyver
6363
elif METADATA["platform"] == "linux":
64-
arch = "manylinux2014_x86_64"
64+
arch = "manylinux_2_28_x86_64"
6565
abitag = METADATA["abi_tag"]
6666
elif METADATA["platform"] == "darwin":
6767
arch = "macosx_10_15_intel"

0 commit comments

Comments
 (0)