Skip to content

Commit 1ae9a8b

Browse files
authored
Fix DLL linking on Windows builds, bump supported python version
1 parent b17cab9 commit 1ae9a8b

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed

.github/workflows/build.yml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,37 @@ permissions:
88

99
jobs:
1010
build_wheels:
11-
name: build wheels on ${{ matrix.os }}
12-
runs-on: ${{ matrix.os }}
11+
name: python ${{ matrix.python }} on ${{ matrix.platform[1] }}
12+
runs-on: ${{ matrix.platform[0] }}
1313
strategy:
1414
matrix:
15-
os: [ windows-latest, macos-latest, macos-13, ubuntu-latest, ubuntu-24.04-arm ]
16-
15+
python:
16+
- "cp310"
17+
- "cp311"
18+
- "cp312"
19+
- "cp313"
20+
- "cp314"
21+
platform:
22+
- [ubuntu-latest, manylinux_x86_64]
23+
- [ubuntu-latest, musllinux_x86_64]
24+
- [ubuntu-24.04-arm, manylinux_aarch64]
25+
- [ubuntu-24.04-arm, musllinux_aarch64]
26+
- [macos-15-intel, macosx_x86_64]
27+
- [macos-latest, macosx_arm64]
28+
- [windows-latest, win_amd64]
29+
- [windows-latest, win32]
30+
1731
steps:
18-
- uses: actions/checkout@v4
19-
20-
- uses: actions/setup-python@v5
21-
with:
22-
python-version: |
23-
3.8
24-
3.9
25-
3.10
26-
3.11
27-
3.12
28-
3.13
29-
30-
- name: install dependencies
31-
run: python -m pip install -r requirements.txt
32+
- uses: actions/checkout@v6
3233

33-
- name: build wheels
34-
run: python -m cibuildwheel --output-dir wheelhouse
34+
- name: Build wheels
35+
uses: pypa/cibuildwheel@v3.3.1
36+
env:
37+
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform[1] }}
3538

36-
- uses: actions/upload-artifact@v4
39+
- uses: actions/upload-artifact@v6
3740
with:
38-
name: rockblock-9704-python-${{ matrix.os }}
41+
name: rockblock-9704-${{ matrix.python }}-${{ matrix.platform[1] }}
3942
path: wheelhouse/*
4043
retention-days: 3
4144
overwrite: true

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: download artifact
16-
uses: actions/download-artifact@v4
16+
uses: actions/download-artifact@v7
1717
- name: bundle
18-
run: tar -zcvf ./rockblock-9704-python.tar.gz rockblock-9704-python-*
18+
run: tar -zcvf ./rockblock-9704-python.tar.gz rockblock-9704-cp*
1919
- name: create release
2020
uses: softprops/action-gh-release@v2
2121
with:

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=RockBLOCK-9704
2-
version=0.1.27
2+
version=0.1.28
33
author=Ground Control
44
maintainer=help@groundcontrol.com
55
sentence=Rockblock 9704 IMT communication library.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[project]
22
name="rockblock9704"
3-
version="0.1.27"
4-
requires-python=">=3.8"
3+
version="0.1.28"
4+
requires-python=">=3.10"
55
description="RockBLOCK 9704 serial tools"
66
readme = "README.rst"
77

0 commit comments

Comments
 (0)