Skip to content

Commit f7ca1da

Browse files
authored
Merge pull request #50 from emattiza/chore/v0.5.0-security-updates
chore: bump to v0.5.0 with security and build chain updates
2 parents f842e62 + ca2557c commit f7ca1da

8 files changed

Lines changed: 68 additions & 179 deletions

File tree

.github/workflows/release.yaml

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
PACKAGE_NAME: rs_chardet
17-
PYTHON_VERSION: "3.10" # to build abi3 wheels
17+
PYTHON_VERSION: "3.11" # to build abi3 wheels
1818

1919
jobs:
2020
macos:
@@ -26,28 +26,15 @@ jobs:
2626
python-version: ${{ env.PYTHON_VERSION }}
2727
architecture: arm64
2828
- name: Install Rust toolchain
29-
uses: actions-rs/toolchain@v1
30-
with:
31-
toolchain: stable
32-
profile: minimal
33-
default: true
29+
uses: dtolnay/rust-toolchain@stable
3430
- name: Build wheels - aarch64
3531
uses: PyO3/maturin-action@v1
3632
with:
3733
target: aarch64
3834
args: --release --out dist -i python${{ env.PYTHON_VERSION }}
39-
maturin-version: "v0.13.0"
4035
- name: Install built wheel - aarch64
4136
run: |
4237
pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
43-
- name: Build wheels - universal2
44-
uses: PyO3/maturin-action@v1
45-
with:
46-
args: --release --universal2 --out dist -i python${{ env.PYTHON_VERSION }}
47-
maturin-version: "v0.13.0"
48-
- name: Install built wheel - universal2
49-
run: |
50-
pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
5138
- name: Upload wheels
5239
uses: actions/upload-artifact@v6
5340
with:
@@ -66,17 +53,12 @@ jobs:
6653
python-version: ${{ env.PYTHON_VERSION }}
6754
architecture: ${{ matrix.target }}
6855
- name: Install Rust toolchain
69-
uses: actions-rs/toolchain@v1
70-
with:
71-
toolchain: stable
72-
profile: minimal
73-
default: true
56+
uses: dtolnay/rust-toolchain@stable
7457
- name: Build wheels
7558
uses: PyO3/maturin-action@v1
7659
with:
7760
target: ${{ matrix.target }}
7861
args: --release --out dist -i python${{ env.PYTHON_VERSION }}
79-
maturin-version: "v0.13.0"
8062
- name: Install built wheel
8163
shell: bash
8264
run: |
@@ -98,18 +80,18 @@ jobs:
9880
with:
9981
python-version: ${{ env.PYTHON_VERSION }}
10082
architecture: ${{ matrix.target }}
83+
- name: Install Rust toolchain
84+
uses: dtolnay/rust-toolchain@stable
10185
- name: Build wheels
10286
uses: PyO3/maturin-action@v1
10387
with:
10488
target: ${{ matrix.target }}
10589
manylinux: auto
10690
args: --release --out dist -i python${{ env.PYTHON_VERSION }}
107-
maturin-version: "v0.13.0"
10891
before-script-linux: |
109-
echo $(which python3.10)
110-
python3.10 --version
92+
echo $(which python3.11)
93+
python3.11 --version
11194
- name: Install built wheel
112-
if: (matrix.os == 'ubuntu-latest' && matrix.target == 'x86_64') || (matrix.os == 'macos-15' && matrix.target == 'aarch64')
11395
run: |
11496
pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
11597
- name: Upload wheels
@@ -122,24 +104,25 @@ jobs:
122104
runs-on: ubuntu-latest
123105
strategy:
124106
matrix:
125-
target: [aarch64, armv7]
107+
target: [aarch64]
126108
steps:
127109
- uses: actions/checkout@v6
128110
- name: Setup QEMU
129111
uses: docker/setup-qemu-action@v3
130112
- uses: actions/setup-python@v6
131113
with:
132114
python-version: ${{ env.PYTHON_VERSION }}
115+
- name: Install Rust toolchain
116+
uses: dtolnay/rust-toolchain@stable
133117
- name: Build wheels
134118
uses: PyO3/maturin-action@v1
135119
with:
136120
target: ${{ matrix.target }}
137121
manylinux: auto
138122
args: --release --out dist -i python${{ env.PYTHON_VERSION }}
139-
maturin-version: "v0.13.0"
140123
before-script-linux: |
141-
echo $(which python3.10)
142-
python3.10 --version
124+
echo $(which python3.11)
125+
python3.11 --version
143126
- name: Upload wheels
144127
uses: actions/upload-artifact@v6
145128
with:
@@ -150,6 +133,8 @@ jobs:
150133
runs-on: ubuntu-latest
151134
steps:
152135
- uses: actions/checkout@v6
136+
- name: Install Rust toolchain
137+
uses: dtolnay/rust-toolchain@stable
153138
- name: Build sdist
154139
uses: PyO3/maturin-action@v1
155140
with:
@@ -158,7 +143,7 @@ jobs:
158143
- name: Upload sdist
159144
uses: actions/upload-artifact@v6
160145
with:
161-
name: rschardet-sdist-${{ matrix.os }}-${{ matrix.target}}
146+
name: rschardet-sdist
162147
path: dist
163148

164149
release:
@@ -182,4 +167,4 @@ jobs:
182167
- name: Display structure of artifacts
183168
run: ls -R dist
184169
- name: Publish package distributions to PyPI
185-
uses: pypa/gh-action-pypi-publish@release/v1
170+
uses: pypa/gh-action-pypi-publish@release/v1

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rs_chardet"
3-
version = "0.4.1"
3+
version = "0.5.0"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
1010

1111
[dependencies]
1212
chardetng = "0.1.17"
13-
pyo3 = { version = "0.25.0", features = ["extension-module", "abi3-py39"] }
13+
pyo3 = { version = "0.29.2", features = ["extension-module", "abi3-py311"] }

0 commit comments

Comments
 (0)