Merge branch 'develop' into henryiii/feat/scikit-build-core

.github/CONTRIBUTING.md

@@ -265,8 +265,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 (will happen
-  automatically on push to master)
+- Make sure the full wheel 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/pr.yml

@@ -6,7 +6,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@main
+      - uses: actions/labeler@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           sync-labels: true

.github/workflows/wheels.yml

@@ -5,14 +5,6 @@ on:
     inputs:
       overrideVersion:
         description: Manually force a version
-  pull_request:
-    branches:
-      - master
-      - main
-  push:
-    branches:
-      - master
-      - main
   release:
     types:
       - published
@@ -35,19 +27,15 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Set version if needed
-        if: github.event.inputs.overrideVersion
-        run: echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}" >> $GITHUB_ENV
-
       - name: Build SDist
         run: pipx run build --sdist
 
       - name: Check metadata
-        run: pipx run twine check --strict dist/*
+        run: pipx run twine check --strict dist/*.tar.gz
 
       - uses: actions/upload-artifact@v4
         with:
-          path: dist/*.tar.gz
+          path: dist/*
           name: wheels-sdist
 
   build_arch_wheels:
@@ -63,11 +51,6 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Set version if needed
-        if: github.event.inputs.overrideVersion
-        shell: bash
-        run: echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}" >> $GITHUB_ENV
-
       - uses: docker/setup-qemu-action@v3.0.0
         with:
           platforms: all
@@ -84,40 +67,50 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          path: wheelhouse/*.whl
+          path: wheelhouse/*
           name: wheel-aarch-${{ strategy.job-index }}
 
   build_wheels:
-    name: ${{ matrix.type }} ${{ matrix.arch }} on ${{ matrix.os }}
+    name: ${{ matrix.build }} ${{ matrix.arch }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, ubuntu-latest]
-        arch: [auto64]
-
         include:
+          - os: windows-2019
+            arch: auto64
+            build: "cp*"
+
+          - os: windows-2019
+            arch: auto64
+            build: "pp*"
+
           - os: macos-latest
             arch: universal2
+            build: "*"
+
+          - os: macos-latest
+            arch: auto64
+            build: cp37*
 
           - os: windows-2019
             arch: auto32
+            build: "*"
 
-          - os: macos-latest
+          - os: ubuntu-latest
             arch: auto64
-            build: cp37*
+            build: "*manylinux*"
+
+          - os: ubuntu-latest
+            arch: auto64
+            build: "*musllinux*"
 
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
 
-      - name: Set version if needed
-        if: github.event.inputs.overrideVersion
-        shell: bash
-        run: echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}" >> $GITHUB_ENV
-
       - uses: pypa/cibuildwheel@v2.17
         env:
           CIBW_BUILD: ${{ matrix.build }}
@@ -137,6 +130,12 @@ jobs:
     name: Upload if release
     needs: [build_wheels, build_arch_wheels, build_sdist]
     runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published'
+    environment:
+      name: pypi
+      url: https://pypi.org/p/boost-histogram
+    permissions:
+      id-token: write
 
     steps:
       - uses: actions/download-artifact@v4
@@ -149,6 +148,3 @@ jobs:
         run: ls -lh dist
 
       - uses: pypa/gh-action-pypi-publish@release/v1
-        if: github.event_name == 'release' && github.event.action == 'published'
-        with:
-          password: ${{ secrets.pypi_password }}

.pre-commit-config.yaml

@@ -96,8 +96,13 @@ repos:
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
 
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.28.0
     hooks:
-      - id: shellcheck
-        exclude: ^docs/notebooks/conf.sh$
+      - id: check-readthedocs
+      - id: check-github-workflows
+
+  - repo: https://github.com/henryiii/validate-pyproject-schema-store
+    rev: 2024.03.25
+    hooks:
+      - id: validate-pyproject

docs/changelog.md

@@ -2,6 +2,29 @@
 
 ## Version 1.4
 
+### Version 1.4.1
+
+#### Features
+
+- NumPy 2 support. [#918][]
+- 32-bit Windows Python 3.12 wheel added (matching NumPy). [#920][]
+
+#### Bugfixes
+
+- Support filling Integer axes with unsigned integers [#917][]
+- Avoid triggering NumPy 2 dev release install on Python 3.12. [#914][]
+
+#### Backend and docs
+
+- Add missing API docs [#909][]
+- Use boost 1.84 [#920][]
+
+[#909]: https://github.com/scikit-hep/boost-histogram/pull/909
+[#914]: https://github.com/scikit-hep/boost-histogram/pull/914
+[#917]: https://github.com/scikit-hep/boost-histogram/pull/917
+[#918]: https://github.com/scikit-hep/boost-histogram/pull/918
+[#920]: https://github.com/scikit-hep/boost-histogram/pull/920
+
 ### Version 1.4.0
 
 #### Features

include/bh_python/fill.hpp

@@ -102,7 +102,9 @@ inline decltype(auto) special_cast<c_array_t<int>>(py::handle x) {
     auto dtype = py::cast<py::array>(x).dtype();
     if(dtype.equal(np.attr("bool_")) || dtype.equal(np.attr("int8"))
        || dtype.equal(np.attr("int16")) || dtype.equal(np.attr("int32"))
-       || dtype.equal(np.attr("int64")))
+       || dtype.equal(np.attr("int64")) || dtype.equal(np.attr("uint8"))
+       || dtype.equal(np.attr("uint16")) || dtype.equal(np.attr("uint32"))
+       || dtype.equal(np.attr("uint64")))
         return py::cast<c_array_t<int>>(x);
     throw py::type_error("Only integer arrays supported when targeting integer axes");
 }

pyproject.toml

@@ -176,19 +176,19 @@ ignore = [
   "tests/.pytest_cache/**",
 ]
 
+
 [tool.cibuildwheel]
 test-extras = "test"
 test-command = "pytest --benchmark-disable {project}/tests"
 test-skip = [
-  "pp*",  # requires correct version to get binary
+  "pp37-*",
+  "pp38-*",
+  "pp310-*",
   "*universal2:arm64",
-  "*musllinux*",
-  "cp312-win_amd64", # NumPy segfaults
+  "cp*-*musllinux*",  # segfault
 ]
-skip = ["pp*-manylinux_i686", "cp312-win32"] # not supported by NumPy
 environment-pass = ["SETUPTOOLS_SCM_PRETEND_VERSION"]
-environment = { PIP_ONLY_BINARY = "numpy" }
-macos.archs = ["universal2"]
+environment.PIP_ONLY_BINARY = "numpy"
 
 
 [tool.pylint]

tests/test_histogram.py

@@ -939,6 +939,17 @@ def test_numpy_conversion_5():
     assert a1[2, 1] == 5
 
 
+@pytest.mark.parametrize(
+    "dtype",
+    [np.int8, np.int16, np.int32, np.int64, np.uint8, np.uint16, np.uint32, np.uint64],
+)
+def test_fill_dtypes(dtype):
+    a = bh.Histogram(bh.axis.Integer(0, 2), storage=bh.storage.Int64())
+    a.fill(np.array([0, 0, 0, 1, 1, 2], dtype=dtype))
+    a.fill(dtype(0))
+    assert list(a.values()) == [4, 2]
+
+
 def test_fill_with_sequence_0():
     def fa(*args):
         return np.array(args, dtype=float)