Merge branch 'master' into dependabot/pip/pytest-cov-gte-4-and-lt-7

.github/workflows/CI.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3'
       - run: pip install pre-commit
         name: Install pre-commit
       - run: pre-commit run --all
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-13, windows-latest ]
-        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']
+        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']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -124,7 +124,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [x86_64, aarch64, armv7, s390x, ppc64le, ppc64]
+        target: [x86_64, aarch64, armv7, s390x, ppc64le, ppc64, i686]
         python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
         manylinux: ['auto', 'musllinux_1_1']
         exclude:
@@ -156,10 +156,10 @@ jobs:
           manylinux: ${{ matrix.manylinux }}
           docker-options: -e UNSAFE_PYO3_SKIP_VERSION_CHECK=1
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
-          name: wheels
-          path: dist
+          name: wheels-linux-${{ matrix.manylinux }}-${{ matrix.target }}-${{ matrix.python_version }}
+          path: dist/*.whl
 
   windows:
     needs:
@@ -170,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [x64, aarch64]
+        target: [x64, aarch64, x86]
         python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
         exclude:
           - target: aarch64
@@ -181,13 +181,23 @@ jobs:
             python_version: 'pypy-3.9'
           - target: aarch64
             python_version: 'pypy-3.10'
+          - target: x86
+            python_version: 'pypy-3.7'
+          - target: x86
+            python_version: 'pypy-3.8'
+          - target: x86
+            python_version: 'pypy-3.9'
+          - target: x86
+            python_version: 'pypy-3.10'
+          - target: x86
+            python_version: '3.13t'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         if: matrix.python_version != '3.13t'
         with:
           python-version: ${{ matrix.python_version }}
-          architecture: x64
+          architecture: ${{ matrix.target == 'x86' && 'x86' || 'x64' }}
       - uses: Quansight-Labs/setup-python@v5
         if: matrix.python_version == '3.13t' && matrix.target == 'x64'
         with:
@@ -212,10 +222,10 @@ jobs:
           args: --release --out dist -i 3.13t
           sccache: 'true'
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
-          name: wheels
-          path: dist
+          name: wheels-windows-${{ matrix.target }}-${{ matrix.python_version }}
+          path: dist/*.whl
 
   macos:
     needs:
@@ -247,10 +257,10 @@ jobs:
           args: --release --out dist --interpreter ${{ matrix.python_version }}
           sccache: 'true'
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
-          name: wheels
-          path: dist
+          name: wheels-macos-${{ matrix.target }}-${{ matrix.python_version }}
+          path: dist/*.whl
 
   sdist:
     needs:
@@ -268,10 +278,10 @@ jobs:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
-          name: wheels
-          path: dist
+          name: wheels-sdist
+          path: dist/*.tar.gz
 
   universal:
     needs:
@@ -291,25 +301,25 @@ jobs:
       - name: Build fallback wheel
         run: python -m build
       - name: Upload sdist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
-          name: wheels
+          name: wheels-universal
           path: dist/*.whl
 
   checksum:
     name: compute hashes
     runs-on: ubuntu-22.04
     needs: [linux, windows, macos, sdist, universal]
-    if: "startsWith(github.ref, 'refs/tags/')"
     outputs:
       hashes: ${{ steps.compute.outputs.hashes }}
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - name: Download distributions
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
-          name: wheels
+          pattern: wheels-*
           path: dist
+          merge-multiple: true
       - name: Collected dists
         run: |
           tree dist
@@ -339,12 +349,20 @@ jobs:
     environment: pypi
     permissions:
       id-token: write
+      contents: write
     steps:
-      - uses: actions/download-artifact@v3
+      - name: Download distributions
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
-          name: wheels
+          pattern: wheels-*
+          path: dist
+          merge-multiple: true
+      - name: "Upload dists to GitHub Release"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          gh release upload ${{ github.ref_name }} dist/* --repo ${{ github.repository }}
       - name: Publish to PyPI
-        uses: PyO3/maturin-action@v1
+        uses: "pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70" # v1.12.3
         with:
-          command: upload
-          args: --non-interactive --skip-existing *
+          attestations: true

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Release History
 ===============
 
+5.0.7 (2025-01-21)
+------------------
+
+- No user facing changes. Release made to include win32/linux i686 wheel published to PyPI.
+
 5.0.6 (2025-01-13)
 ------------------
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jh2"
-version = "5.0.6"
+version = "5.0.7"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

dev-requirements.txt

@@ -1,4 +1,4 @@
-pytest>=7,<8
+pytest>=7,<9
 pytest-cov>=4,<7
 pytest-xdist>=3,<4
 hypothesis>=5.5,<7

jh2/__init__.py

@@ -7,4 +7,4 @@
 
 from __future__ import annotations
 
-__version__ = "5.0.6"
+__version__ = "5.0.7"

pyproject.toml

@@ -13,7 +13,7 @@ authors = [
   {name = "Cory Benfield", email = "[email protected]"}
 ]
 maintainers = [
-  {name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
+  {name = "Ahmed R. TAHRI", email="tahri[email protected]"},
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",