fix: support NumPy 2 (#918)

* fix: support NumPy 2

Signed-off-by: Henry Schreiner <[email protected]>

* style: pre-commit fixes

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/workflows/tests.yml

@@ -80,7 +80,7 @@ jobs:
           allow-prereleases: true
 
       - name: Install python tools
-        run: python -m pip install -r dev-requirements.txt pytest-github-actions-annotate-failures
+        run: python -m pip install -r dev-requirements.txt pytest-github-actions-annotate-failures numpy>=2.0a1
 
       - name: Configure
         run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBOOST_HISTOGRAM_ERRORS=ON ${{ matrix.cmake-extras }}

noxfile.py

@@ -6,12 +6,10 @@
 
 import nox
 
-ALL_PYTHONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
-
 nox.options.sessions = ["lint", "tests"]
 
 
-@nox.session(python=ALL_PYTHONS)
+@nox.session
 def tests(session: nox.Session) -> None:
     """
     Run the unit and regular tests.
@@ -22,6 +20,17 @@ def tests(session: nox.Session) -> None:
     session.run("pytest", *session.posargs)
 
 
+@nox.session
+def testsnp2(session: nox.Session) -> None:
+    """
+    Run the unit and regular tests with NumPy 2.
+    """
+
+    shutil.rmtree("build", ignore_errors=True)
+    session.install(".[test]", "numpy>=2.0a1")
+    session.run("pytest", *session.posargs)
+
+
 @nox.session
 def hist(session: nox.Session) -> None:
     """

tests/conftest.py

@@ -1,9 +1,22 @@
 from __future__ import annotations
 
+import contextlib
+import sys
+from pathlib import Path
+
+if sys.version_info < (3, 11):
+    import tomli as tomllib
+else:
+    import tomllib
+
 import pytest
+from packaging.requirements import Requirement
 
 import boost_histogram as bh
 
+DIR = Path(__file__).parent.resolve()
+BASE = DIR.parent
+
 
 @pytest.fixture(params=(False, True), ids=("no_growth", "growth"))
 def growth(request):
@@ -58,3 +71,32 @@ def count_storage(request):
 )
 def count_single_storage(request):
     return request.param
+
+
+def pytest_report_header() -> str:
+    if sys.version_info < (3, 8):
+        import importlib_metadata as metadata
+    else:
+        from importlib import metadata
+
+    with BASE.joinpath("pyproject.toml").open("rb") as f:
+        pyproject = tomllib.load(f)
+    project = pyproject.get("project", {})
+
+    pkgs = project.get("dependencies", [])
+    pkgs += [p for ps in project.get("optional-dependencies", {}).values() for p in ps]
+    if "name" in project:
+        pkgs.append(project["name"])
+    interesting_packages = {Requirement(p).name for p in pkgs}
+    interesting_packages.add("pip")
+    interesting_packages.add("numpy")
+
+    valid = []
+    for package in sorted(interesting_packages):
+        with contextlib.suppress(ModuleNotFoundError):
+            valid.append(f"{package}=={metadata.version(package)}")
+    reqs = " ".join(valid)
+    lines = [
+        f"installed packages of interest: {reqs}",
+    ]
+    return "\n".join(lines)