Merge branch 'develop' into multi_weight_storage

Author: HDembinski

.clang-tidy

@@ -2,11 +2,28 @@ FormatStyle: file
 
 Checks: "
   modernize-*,
-  -modernize-use-trailing-return-type,
+  readability-*,
+  bugprone-*,
+  performance-*,
+  portability-*,
+  clang-analyzer-*,
+  misc-*,
+  -bugprone-easily-swappable-parameters,
+  -misc-include-cleaner,
+  -misc-no-recursion,
+  -misc-non-private-member-variables-in-classes,
+  -misc-redundant-expression,
   -modernize-avoid-c-arrays,
-  llvm-namespace-comment,
-  readability-container-size-empty,
+  -modernize-use-trailing-return-type,
+  -readability-braces-around-statements,
+  -readability-function-cognitive-complexity,
+  -readability-identifier-length,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  google-explicit-constructor,
   google-readability-casting,
+  llvm-namespace-comment,
   "
 
 HeaderFilterRegex: "bh_python/.*hpp"
+UseColor: true

.github/CONTRIBUTING.md

@@ -59,9 +59,7 @@ Python's built-in venv:
 ```bash
 python3 -m venv .venv
 source ./.venv/bin/activate
-pip install dependency-groups
-pip-install-dependency-groups dev
-pip install -ve.
+pip install -ve. --group dev
 ```
 
 Or if you use uv:
@@ -177,18 +175,11 @@ it yourself (even without installing the hooks) using:
 pre-commit run --all-files
 ```
 
-We do not check `check-manifest` every time locally, since it is slow. You can trigger
-this manual check with:
-
-```bash
-pre-commit run --all-files --hook-stage manual check-manifest
-```
-
 Developers should update the pre-commit dependencies once in a while, you can
 do this automatically with:
 
 ```bash
-pre-commit autoupdate
+pre-commit autoupdate -j8
 ```
 
 > #### Note about skipping Docker
@@ -204,10 +195,18 @@ To run Clang tidy, the following recipe should work. Files will be modified in
 place, so you can use git to monitor the changes.
 
 ```bash
-docker run --rm -v $PWD:/pybind11 -it silkeh/clang:10
-apt-get update && apt-get install python3-dev
-cmake -S pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);-fix"
-cmake --build build
+docker run --rm -v $PWD:/pybind11 -it silkeh/clang:20
+apt update && apt install -y python3-dev python3-pip git ninja-build
+python3 -m pip install setuptools_scm --break-system-packages
+cmake --preset tidy
+cmake --build --preset tidy
+```
+
+To autofix, use:
+
+```bash
+cmake --preset --preset tidy -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--fix"
+cmake --build --preset tidy -j1
 ```
 
 Remember to build single-threaded if applying fixes!
@@ -243,16 +242,10 @@ Make time/memory taken can be set
 
 <details><summary>Updating dependencies (click to expand)</summary>
 
-This will checkout new versions of the dependencies. Example given using the
-fish shell.
+This will checkout new versions of the dependencies.
 
-```fish
-for f in *
-    cd $f
-    git fetch
-    git checkout boost-1.75.0 || echo "Not found"
-    cd ..
-end
+```bash
+nox -s bump_boost -- 1.88.0
 ```
 
 </details>
@@ -262,7 +255,7 @@ end
 - Finish merging open PRs that you want in the new version
 - Add most recent changes to the `docs/CHANGELOG.md`
 - Sync master with develop using `git checkout master; git merge develop --ff-only` and push
-- Make sure the full wheel build runs on master without issues (manually trigger if needed)
+- Make sure the `cmake --preset tidy` build runs on master without issues (manually trigger if needed)
 - Make the GitHub release in the GitHub UI. Copy the changelog entries and
   links for that version; this has to be done as part of the release and tag
   procedure for archival tools (Zenodo) to pick them up correctly.

.github/workflows/emscripten.yaml

@@ -17,14 +17,14 @@ concurrency:
 jobs:
   build-pyodide:
     name: Pyodide cibuildwheel
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
 
-      - uses: pypa/cibuildwheel@v2.23
+      - uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_PLATFORM: pyodide
 

.github/workflows/tests.yml

@@ -19,11 +19,11 @@ jobs:
   clang-tidy:
     name: Clang-Tidy
     runs-on: ubuntu-latest
-    container: silkeh/clang:18-bookworm
+    container: silkeh/clang:20
 
     steps:
       - name: Install requirements
-        run: apt-get update && apt-get install -y python3-dev python3-pip git
+        run: apt-get update && apt-get install -y python3-dev python3-pip git ninja-build
 
       - uses: actions/checkout@v4
         with:
@@ -34,10 +34,10 @@ jobs:
         run: python3 -m pip install setuptools_scm --break-system-packages
 
       - name: Configure
-        run: cmake -S. -Bbuild -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--warnings-as-errors=*"
+        run: cmake --preset tidy
 
       - name: Build
-        run: cmake --build build -j 4
+        run: cmake --build --preset tidy
 
   pylint:
     runs-on: ubuntu-latest
@@ -87,14 +87,13 @@ jobs:
           create-symlink: true
 
       - name: Install python tools
-        run: |
-          uv pip install --system --python=python --group dev --only-binary numpy pytest-github-actions-annotate-failures
+        run: uv pip install --system --python=python --group github
 
       - name: Configure
-        run: cmake --preset default -DCMAKE_BUILD_TYPE=Debug ${{ matrix.cmake-extras }}
+        run: cmake --preset default ${{ matrix.cmake-extras }}
 
       - name: Build
-        run: cmake --build --preset default -j 4
+        run: cmake --build --preset default
 
       - name: Test
         run: ctest --preset default -j 4
@@ -129,11 +128,9 @@ jobs:
 
       - uses: astral-sh/setup-uv@v6
 
-      - uses: pypa/cibuildwheel@v2.23
+      - uses: pypa/cibuildwheel@v3.0
         with:
           only: "${{ matrix.only }}"
-        env:
-          CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/wheels.yml

@@ -11,9 +11,14 @@ on:
   pull_request:
     paths:
       - .github/workflows/wheels.yml
+  schedule:
+    - cron: "34 3 * * *"
+
+permissions:
+  actions: read
 
 concurrency:
-  group: wheels-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
@@ -55,15 +60,15 @@ jobs:
             arch: auto64
             build: "*"
 
-          - os: windows-2019
+          - os: windows-latest
             arch: auto64
             build: "cp*"
 
-          - os: windows-2019
+          - os: windows-latest
             arch: auto64
-            build: "pp*"
+            build: "{p,g}p*"
 
-          - os: windows-2019
+          - os: windows-latest
             arch: auto32
             build: "*"
 
@@ -95,7 +100,7 @@ jobs:
 
       - uses: astral-sh/setup-uv@v6
 
-      - uses: pypa/cibuildwheel@v2.23
+      - uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -110,9 +115,66 @@ jobs:
           path: wheelhouse/*.whl
           name: wheels-${{ strategy.job-index }}
 
+  build_ios_wheels:
+    name: iOS ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [macos-latest, macos-13]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - run: brew upgrade cmake
+
+      - uses: pypa/cibuildwheel@v3.0
+        env:
+          CIBW_PLATFORM: ios
+
+      - name: Verify clean directory
+        run: git diff --exit-code
+        shell: bash
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          path: wheelhouse/*.whl
+          name: wheels-ios-${{ matrix.runs-on }}
+
+  #  build_android_wheels:
+  #    name: Android ${{ matrix.runs-on }}
+  #    runs-on: ${{ matrix.runs-on }}
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        runs-on: [ubuntu-latest, macos-latest]
+  #    steps:
+  #      - uses: actions/checkout@v4
+  #        with:
+  #          fetch-depth: 0
+  #          submodules: true
+  #
+  #      - uses: mhsmith/cibuildwheel@android
+  #        env:
+  #          CIBW_PLATFORM: android
+  #
+  #      - name: Verify clean directory
+  #        run: git diff --exit-code
+  #        shell: bash
+  #
+  #      - name: Upload wheels
+  #        uses: actions/upload-artifact@v4
+  #        with:
+  #          path: wheelhouse/*.whl
+  #          name: wheels-android-${{ matrix.runs-on }}
+
   upload_all:
     name: Upload if release
-    needs: [build_wheels, build_sdist]
+    needs: [build_wheels, build_ios_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     environment:
@@ -139,3 +201,27 @@ jobs:
           subject-path: "dist/boost_histogram-*"
 
       - uses: pypa/gh-action-pypi-publish@release/v1
+
+  upload_nightly_wheels:
+    name: Upload nightly wheels to Anaconda Cloud
+    if: |
+      (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') &&
+      !github.event.repository.fork &&
+      github.ref == 'refs/heads/develop'
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: wheels-*
+          merge-multiple: true
+          path: dist
+
+      - name: List all files
+        run: ls -lh dist
+
+      - name: Upload wheel to Anaconda Cloud as nightly
+        uses: scientific-python/upload-nightly-action@b36e8c0c10dbcfd2e05bf95f17ef8c14fd708dbf # 0.6.2
+        with:
+          artifacts_path: dist
+          anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

.pre-commit-config.yaml

@@ -36,14 +36,14 @@ repos:
         types_or: [yaml, markdown, html, css, scss, javascript, json]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.11.8"
+    rev: "v0.11.12"
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: mypy
         files: ^src
@@ -65,7 +65,7 @@ repos:
         exclude: .pre-commit-config.yaml
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.3
+    rev: v20.1.5
     hooks:
       - id: clang-format
         types_or: [c++]
@@ -82,8 +82,8 @@ repos:
     hooks:
       - id: check-readthedocs
       - id: check-github-workflows
-
-  - repo: https://github.com/henryiii/validate-pyproject-schema-store
-    rev: 2025.04.28
-    hooks:
-      - id: validate-pyproject
+# TMP: waiting for cibuildwheel 3.0
+#  - repo: https://github.com/henryiii/validate-pyproject-schema-store
+#    rev: 2025.05.12
+#    hooks:
+#      - id: validate-pyproject

CMakeLists.txt

@@ -118,16 +118,10 @@ source_group(
 option(BOOST_HISTOGRAM_ERRORS "Make warnings errors (for CI mostly)")
 
 # Adding warnings
+# Boost.Histogram doesn't pass sign -Wsign-conversion
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-  target_compile_options(
-    _core
-    PRIVATE -Wall
-            -Wextra
-            -pedantic-errors
-            -Wconversion
-            -Wsign-conversion
-            -Wsign-compare
-            -Wno-unused-value)
+  target_compile_options(_core PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-compare
+                                       -Wno-unused-value)
   if(BOOST_HISTOGRAM_ERRORS)
     target_compile_options(_core PRIVATE -Werror)
   endif()