Skip to content

Commit c4b4e5f

Browse files
authored
Merge pull request #12 from jawah/publish-win32
Release 5.0.7
2 parents 3912586 + a9191ae commit c4b4e5f

File tree

6 files changed

+56
-33
lines changed

6 files changed

+56
-33
lines changed

.github/workflows/CI.yml

+45-27
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-python@v5
2626
with:
27-
python-version: '3.10'
27+
python-version: '3'
2828
- run: pip install pre-commit
2929
name: Install pre-commit
3030
- run: pre-commit run --all
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: [ubuntu-22.04, macos-13, windows-latest ]
38-
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
38+
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
3939
runs-on: ${{ matrix.os }}
4040
steps:
4141
- uses: actions/checkout@v4
@@ -124,7 +124,7 @@ jobs:
124124
strategy:
125125
fail-fast: false
126126
matrix:
127-
target: [x86_64, aarch64, armv7, s390x, ppc64le, ppc64]
127+
target: [x86_64, aarch64, armv7, s390x, ppc64le, ppc64, i686]
128128
python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
129129
manylinux: ['auto', 'musllinux_1_1']
130130
exclude:
@@ -156,10 +156,10 @@ jobs:
156156
manylinux: ${{ matrix.manylinux }}
157157
docker-options: -e UNSAFE_PYO3_SKIP_VERSION_CHECK=1
158158
- name: Upload wheels
159-
uses: actions/upload-artifact@v3
159+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
160160
with:
161-
name: wheels
162-
path: dist
161+
name: wheels-linux-${{ matrix.manylinux }}-${{ matrix.target }}-${{ matrix.python_version }}
162+
path: dist/*.whl
163163

164164
windows:
165165
needs:
@@ -170,7 +170,7 @@ jobs:
170170
strategy:
171171
fail-fast: false
172172
matrix:
173-
target: [x64, aarch64]
173+
target: [x64, aarch64, x86]
174174
python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
175175
exclude:
176176
- target: aarch64
@@ -181,13 +181,23 @@ jobs:
181181
python_version: 'pypy-3.9'
182182
- target: aarch64
183183
python_version: 'pypy-3.10'
184+
- target: x86
185+
python_version: 'pypy-3.7'
186+
- target: x86
187+
python_version: 'pypy-3.8'
188+
- target: x86
189+
python_version: 'pypy-3.9'
190+
- target: x86
191+
python_version: 'pypy-3.10'
192+
- target: x86
193+
python_version: '3.13t'
184194
steps:
185195
- uses: actions/checkout@v4
186196
- uses: actions/setup-python@v5
187197
if: matrix.python_version != '3.13t'
188198
with:
189199
python-version: ${{ matrix.python_version }}
190-
architecture: x64
200+
architecture: ${{ matrix.target == 'x86' && 'x86' || 'x64' }}
191201
- uses: Quansight-Labs/setup-python@v5
192202
if: matrix.python_version == '3.13t' && matrix.target == 'x64'
193203
with:
@@ -212,10 +222,10 @@ jobs:
212222
args: --release --out dist -i 3.13t
213223
sccache: 'true'
214224
- name: Upload wheels
215-
uses: actions/upload-artifact@v3
225+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
216226
with:
217-
name: wheels
218-
path: dist
227+
name: wheels-windows-${{ matrix.target }}-${{ matrix.python_version }}
228+
path: dist/*.whl
219229

220230
macos:
221231
needs:
@@ -247,10 +257,10 @@ jobs:
247257
args: --release --out dist --interpreter ${{ matrix.python_version }}
248258
sccache: 'true'
249259
- name: Upload wheels
250-
uses: actions/upload-artifact@v3
260+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
251261
with:
252-
name: wheels
253-
path: dist
262+
name: wheels-macos-${{ matrix.target }}-${{ matrix.python_version }}
263+
path: dist/*.whl
254264

255265
sdist:
256266
needs:
@@ -268,10 +278,10 @@ jobs:
268278
command: sdist
269279
args: --out dist
270280
- name: Upload sdist
271-
uses: actions/upload-artifact@v3
281+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
272282
with:
273-
name: wheels
274-
path: dist
283+
name: wheels-sdist
284+
path: dist/*.tar.gz
275285

276286
universal:
277287
needs:
@@ -291,25 +301,25 @@ jobs:
291301
- name: Build fallback wheel
292302
run: python -m build
293303
- name: Upload sdist
294-
uses: actions/upload-artifact@v3
304+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
295305
with:
296-
name: wheels
306+
name: wheels-universal
297307
path: dist/*.whl
298308

299309
checksum:
300310
name: compute hashes
301311
runs-on: ubuntu-22.04
302312
needs: [linux, windows, macos, sdist, universal]
303-
if: "startsWith(github.ref, 'refs/tags/')"
304313
outputs:
305314
hashes: ${{ steps.compute.outputs.hashes }}
306315
steps:
307316
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
308317
- name: Download distributions
309-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
318+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
310319
with:
311-
name: wheels
320+
pattern: wheels-*
312321
path: dist
322+
merge-multiple: true
313323
- name: Collected dists
314324
run: |
315325
tree dist
@@ -339,12 +349,20 @@ jobs:
339349
environment: pypi
340350
permissions:
341351
id-token: write
352+
contents: write
342353
steps:
343-
- uses: actions/download-artifact@v3
354+
- name: Download distributions
355+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
344356
with:
345-
name: wheels
357+
pattern: wheels-*
358+
path: dist
359+
merge-multiple: true
360+
- name: "Upload dists to GitHub Release"
361+
env:
362+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
363+
run: |
364+
gh release upload ${{ github.ref_name }} dist/* --repo ${{ github.repository }}
346365
- name: Publish to PyPI
347-
uses: PyO3/maturin-action@v1
366+
uses: "pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70" # v1.12.3
348367
with:
349-
command: upload
350-
args: --non-interactive --skip-existing *
368+
attestations: true

CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Release History
22
===============
33

4+
5.0.7 (2025-01-21)
5+
------------------
6+
7+
- No user facing changes. Release made to include win32/linux i686 wheel published to PyPI.
8+
49
5.0.6 (2025-01-13)
510
------------------
611

Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jh2"
3-
version = "5.0.6"
3+
version = "5.0.7"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

jh2/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
from __future__ import annotations
99

10-
__version__ = "5.0.6"
10+
__version__ = "5.0.7"

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ authors = [
1313
{name = "Cory Benfield", email = "[email protected]"}
1414
]
1515
maintainers = [
16-
{name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
16+
{name = "Ahmed R. TAHRI", email="tahri[email protected]"},
1717
]
1818
classifiers = [
1919
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)