Fix wheels (#98)

Pulled over some updates from iminuit. Implemented workarounds for failing tests, related to matplotlib wheels which are not available on some platforms.

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: HDembinski

.github/workflows/coverage.yml

@@ -2,17 +2,16 @@ name: Coverage
 
 on:
   pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '*.rst'
-      - '*.md'
+    paths:
+      - ".github/workflows/coverage.yml"
+      - "**.py"
+      - "**.cpp"
+      - "**.hpp"
+      - pyproject.toml
+      - CMakeLists.txt
   push:
     branches:
       - main
-    paths-ignore:
-      - 'docs/**'
-      - '*.rst'
-      - '*.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
@@ -23,25 +22,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
-      with:
-        submodules: true
-        fetch-depth: 3
-    # must come after checkout
-    - uses: hendrikmuhs/[email protected]
-      with:
-        key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.python-version }}
-    - uses: actions/setup-python@v6
-      with:
-        python-version: 3.11
-    - run: python -m pip install --upgrade pip
-    - run: python -m pip install --prefer-binary coveralls
-    - run: python -m pip install --prefer-binary -e .[test]
-    - run: coverage run -m pytest
-    - uses: ts-graphviz/setup-graphviz@v2
-    - run: coverage run --append -m pytest
-    - run: python -m pip uninstall --yes particle
-    - run: coverage run --append -m pytest
-    - run: coveralls --service=github
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v5
+        with:
+          submodules: true
+          fetch-depth: 3
+      # must come after checkout
+      - uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.python-version }}
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.11
+      - run: python -m pip install --upgrade pip
+      - run: python -m pip install --prefer-binary coveralls
+      - run: python -m pip install --prefer-binary -e .[test]
+      - run: coverage run -m pytest
+      - uses: ts-graphviz/setup-graphviz@v2
+      - run: coverage run --append -m pytest
+      - run: python -m pip uninstall --yes particle
+      - run: coverage run --append -m pytest
+      - run: coveralls --service=github
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -2,10 +2,13 @@ name: Test
 
 on:
   pull_request:
-    paths-ignore:
-      - "docs/**"
-      - "*.rst"
-      - "*.md"
+    paths:
+      - ".github/workflows/test.yml"
+      - "**.py"
+      - "**.cpp"
+      - "**.hpp"
+      - pyproject.toml
+      - CMakeLists.txt
   workflow_dispatch:
 
 concurrency:

.github/workflows/wheels.yml

@@ -4,6 +4,10 @@ on:
   push:
     tags:
       - "**"
+  pull_request:
+    paths:
+      - .github/workflows/wheels.yml
+      - pyproject.toml
   workflow_dispatch:
 
 concurrency:
@@ -22,29 +26,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        arch: [auto, aarch64]
-        py: [cp39, cp310, cp311, cp312, cp313]
+        os:
+          [
+            ubuntu-latest,
+            windows-latest,
+            macos-13,
+            macos-14,
+            ubuntu-24.04-arm,
+            windows-11-arm,
+          ]
+        py: [cp39, cp310, cp311, cp312, cp313, cp314]
         exclude:
-          - os: windows-latest
-            arch: aarch64
-          - os: macos-13
-            arch: aarch64
-          - os: macos-14
-            arch: aarch64
+          - os: ubuntu-24.04-arm
+            py: cp39
+          - os: windows-11-arm
+            py: cp39
+          - os: windows-11-arm
+            py: cp310
+
     steps:
       - uses: actions/checkout@v5
         with:
           submodules: true
           fetch-depth: 0 # needed by setuptools_scm
 
-      - if: ${{ matrix.arch == 'aarch64' }}
-        uses: docker/setup-qemu-action@v3
+      - uses: astral-sh/setup-uv@v6
 
       - uses: pypa/[email protected]
         env:
           CIBW_BUILD: ${{ matrix.py }}-*
-          CIBW_ARCHS: ${{ matrix.arch }}
 
       - uses: actions/upload-artifact@v4
         with:
@@ -62,7 +72,7 @@ jobs:
 
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - run: pipx run build --sdist
       - run: python -m pip install --upgrade pip setuptools

.pre-commit-config.yaml

@@ -13,59 +13,59 @@
 # See https://github.com/pre-commit/pre-commit
 
 repos:
-# Standard hooks
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v6.0.0
-  hooks:
-  - id: check-case-conflict
-  - id: check-docstring-first
-  - id: check-executables-have-shebangs
-  - id: check-merge-conflict
-  - id: check-symlinks
-  - id: check-yaml
-    args: ["--allow-multiple-documents"]
-  - id: debug-statements
-    files: src/pyhepmc/.*\\.py
-  - id: end-of-file-fixer
-  - id: mixed-line-ending
-  - id: sort-simple-yaml
-  - id: file-contents-sorter
-  - id: trailing-whitespace
-    exclude: ^doc/_static/.*.svg
+  # Standard hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-yaml
+        args: ["--allow-multiple-documents"]
+      - id: debug-statements
+        files: src/pyhepmc/.*\\.py
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: sort-simple-yaml
+      - id: file-contents-sorter
+      - id: trailing-whitespace
+        exclude: ^doc/_static/.*.svg
 
-# Python formatting
-- repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 25.9.0
-  hooks:
-  - id: black
+  # Ruff linter, replacement for flake8, pydocstyle, isort
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.14.1"
+    hooks:
+      - id: ruff
+        args: [--fix, --show-fixes]
+      - id: ruff-format
 
-# Ruff linter, replacement for flake8, pydocstyle, isort
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.14.1'
-  hooks:
-    - id: ruff
-      args: [--fix, --show-fixes]
+  # C++ formatting
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v21.1.2
+    hooks:
+      - id: clang-format
 
-# C++ formatting
-- repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v21.1.2
-  hooks:
-  - id: clang-format
+  # CMake formatting
+  - repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: v0.6.13
+    hooks:
+      - id: cmake-format
+        additional_dependencies: [pyyaml]
+        types: [file]
+        files: (\.cmake|CMakeLists.txt)(.in)?$
 
-# CMake formatting
-- repo: https://github.com/cheshirekow/cmake-format-precommit
-  rev: v0.6.13
-  hooks:
-  - id: cmake-format
-    additional_dependencies: [pyyaml]
-    types: [file]
-    files: (\.cmake|CMakeLists.txt)(.in)?$
+  # Python type checking
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: "v1.18.2"
+    hooks:
+      - id: mypy
+        # additional_dependencies: [numpy]
+        args: [src]
+        pass_filenames: false
 
-# Python type checking
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 'v1.18.2'
-  hooks:
-  - id: mypy
-    # additional_dependencies: [numpy]
-    args: [src]
-    pass_filenames: false
+  - repo: https://github.com/henryiii/validate-pyproject-schema-store
+    rev: 2025.10.11
+    hooks:
+      - id: validate-pyproject

pyproject.toml

@@ -24,15 +24,25 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Intended Audience :: Developers",
 ]
-dependencies = ["numpy>=1.21", "packaging", "backports.zstd"]
+dependencies = [
+    "numpy>=1.21",
+    "packaging",
+    "backports.zstd ; python_version<'3.14'",
+]
+
 dynamic = ["version"]
 
 [project.urls]
 repository = "https://github.com/scikit-hep/pyhepmc"
 documentation = "https://scikit-hep.org/pyhepmc"
 
 [project.optional-dependencies]
-test = ["pytest", "particle", "matplotlib"]
+test = [
+    "pytest",
+    "particle",
+    # There are issues with binary wheels on some platforms right now
+    'matplotlib; (platform_system != "Windows" or python_version <"3.12") and (platform_system != "Linux" or platform_machine != "aarch64")',
+]
 doc = ["sphinx", "sphinx-rtd-theme", "nbsphinx", "ipython", "ipykernel"]
 
 [tool.setuptools_scm]
@@ -77,6 +87,7 @@ unfixable = [
 ]
 extend-ignore = [
     "D212", # multi-line-summary-first-line
+    "E731", # lambda-assignment
 ]
 pydocstyle.convention = "numpy"
 
@@ -89,22 +100,18 @@ pydocstyle.convention = "numpy"
 "setup*.py" = ["D"]
 
 [tool.cibuildwheel]
-# update skip when numpy wheels become available
-skip = ["*-musllinux_*", "cp31?-win32", "cp31?-manylinux_i686"]
+skip = ["cp39-musllinux_i686"]                    # no numpy wheel
 test-extras = ["test"]
 test-command = "python -m pytest {package}/tests"
 test-skip = ["*universal2:arm64"]
-# to match numpy, we use manylinux2014 for cp310+
-manylinux-x86_64-image = "manylinux2014"
-manylinux-i686-image = "manylinux2014"
 
 [tool.cibuildwheel.environment]
 # this makes sure that we build only on platforms that have a corresponding numpy wheel
 PIP_ONLY_BINARY = ":all:"
+# flag is used to disable a test that doesn't work on CI
 CIBW = "1"
 
 [[tool.cibuildwheel.overrides]]
-# to match numpy, we use manylinux2010 for cp36 to cp39
-select = "cp3?-*"
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"
+# to match numpy, we use manylinux2014 for cp310 (and 3.9, since manylinux2010 is dead)
+select = "cp3{9,10}-manylinux*"
+manylinux-x86_64-image = "manylinux2014"

src/pyhepmc/io.py

@@ -222,8 +222,8 @@ def __init__(
         self,
         fileobj: Filename,
         mode: str = "r",
-        precision: int = None,
-        format: str = None,
+        precision: Optional[int] = None,
+        format: Optional[str] = None,
     ):
         open_file: Optional[Callable[[], Any]] = None
         if hasattr(fileobj, "read") and hasattr(fileobj, "write"):
@@ -251,7 +251,9 @@ def __init__(
                 from sys import version_info
 
                 if version_info >= (3, 14):
-                    from compression import zstd
+                    # The canonical import should work from 3.14 onwards,
+                    # but right now fails on Ubuntu even on 3.14
+                    from compression import zstd  # pyright: ignore[reportMissingImports]
                 else:
                     from backports import zstd
                 open = zstd.open
@@ -260,7 +262,7 @@ def __init__(
 
                 mode += "b"
 
-            open_file = lambda: open(fn, mode)  # noqa: E731
+            open_file = lambda: open(fn, mode)
 
             self._close_file = True
 
@@ -355,8 +357,8 @@ def close(self) -> None:
 def open(
     fileobj: Filename,
     mode: str = "r",
-    precision: int = None,
-    format: str = None,
+    precision: Optional[int] = None,
+    format: Optional[str] = None,
 ) -> Any:
     """
     Open HepMC files for reading or writing.