chore: bump boost-histogram min version to 1.5 (#631)

Require 1.5+, remove compat code for older versions.

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

Author: henryiii

.github/CONTRIBUTING.md

@@ -23,7 +23,7 @@ specific jobs:
 ```console
 $ nox -l # List all the defined sessions
 $ nox -s lint  # Lint only
-$ nox -s tests-3.9  # Python 3.9 tests only
+$ nox -s tests-3.14  # Python 3.14 tests only
 $ nox -s docs -- serve  # Build and serve the docs
 $ nox -s build  # Make an SDist and wheel
 ```
@@ -33,34 +33,24 @@ environment for each run. On Linux, it will run the `--mpl` tests. You can
 run the linux tests from anywhere with Docker:
 
 ```bash
-docker run --rm -v $PWD:/nox -w /nox -t quay.io/pypa/manylinux2014_x86_64:latest pipx run nox -s tests-3.9
+docker run --rm -v $PWD:/nox -w /nox -t quay.io/pypa/manylinux_2_28_x86_64:latest pipx run nox -s tests-3.9
 # Regenerate the MPL comparison images:
-docker run --rm -v $PWD:/nox -w /nox -t quay.io/pypa/manylinux2014_x86_64:latest pipx run nox -s regenerate
+docker run --rm -v $PWD:/nox -w /nox -t quay.io/pypa/manylinux_2_28_x86_64:latest pipx run nox -s regenerate
 ```
 
 ### PyPI
 
 For extended development, you can set up a development environment using PyPI.
 
 ```bash
-$ python3 -m venv venv
-$ source venv/bin/activate
-(venv)$ pip install -e .[dev]
+$ python3 -m venv .venv
+$ source .venv/bin/activate
+(venv)$ pip install -e . --group dev
 (venv)$ python -m ipykernel install --user --name hist
 ```
 
 You should have pip 10 or later.
 
-### Conda
-
-You can also set up a development environment using Conda. With conda, you can search some channels for development.
-
-```bash
-$ conda env create -f dev-environment.yml -n hist
-$ conda activate hist
-(hist)$ python -m ipykernel install --name hist
-```
-
 ## Post setup
 
 You should prepare pre-commit, which will help you by checking that commits

dev-environment.yml

@@ -40,7 +40,7 @@ keywords = [
 ]
 requires-python = ">=3.9"
 dependencies = [
-    "boost-histogram>=1.3.1,<1.7",
+    "boost-histogram>=1.5,<1.7",
     "histoprint>=2.2.0",
     'numpy>=1.19.3',
     'typing-extensions>=4;python_version<"3.11"',

pyproject.toml

@@ -4,7 +4,6 @@
 from collections.abc import Iterable
 from typing import Any, Protocol
 
-import boost_histogram as bh
 import boost_histogram.axis as bha
 
 import hist
@@ -227,18 +226,11 @@ def __init__(
         __dict__: dict[str, Any] | None = None,
     ) -> None:
         has_flow = flow if overflow is None else overflow
-        if tuple(int(x) for x in bh.__version__.split(".")[:2]) < (1, 4):
-            if not has_flow:
-                msg = "Boost-histogram 1.4+ required for flowless Category axes"
-                raise TypeError(msg)
-            kwargs = {}
-        else:
-            kwargs = {"overflow": has_flow}
         super().__init__(
             categories,
             metadata=metadata,
             growth=growth,
-            **kwargs,
+            overflow=has_flow,
             __dict__=__dict__,
         )
         self._raw_metadata["name"] = name
@@ -261,18 +253,11 @@ def __init__(
         __dict__: dict[str, Any] | None = None,
     ) -> None:
         has_flow = flow if overflow is None else overflow
-        if tuple(int(x) for x in bh.__version__.split(".")[:2]) < (1, 4):
-            if not has_flow:
-                msg = "Boost-histogram 1.4+ required for flowless Category axes"
-                raise TypeError(msg)
-            kwargs = {}
-        else:
-            kwargs = {"overflow": has_flow}
         super().__init__(
             categories,
             metadata=metadata,
             growth=growth,
-            **kwargs,
+            overflow=has_flow,
             __dict__=__dict__,
         )
         self._raw_metadata["name"] = name

src/hist/axis/__init__.py

@@ -180,13 +180,6 @@ def __init__(
         self.name = name
         self.label = label
 
-    # Backport of storage_type from boost-histogram 1.3.2:
-    if not hasattr(bh.Histogram, "storage_type"):
-
-        @property
-        def storage_type(self) -> type[bh.storage.Storage]:
-            return self._storage_type
-
     def _generate_axes_(self) -> NamedAxesTuple:
         """
         This is called to fill in the axes. Subclasses can override it if they need

src/hist/basehist.py

@@ -11,8 +11,6 @@
 import hist
 from hist import Hist, axis, storage
 
-BHV = tuple(int(x) for x in bh.__version__.split(".")[:2])
-
 # TODO: specify what error is raised
 
 
@@ -205,21 +203,17 @@ def test_general_fill_integer():
 
 def test_general_fill_int_cat():
     h = Hist(
-        axis.IntCategory(range(10), name="x", flow=BHV < (1, 4)),
-        axis.IntCategory(range(10), name="y", overflow=BHV < (1, 4)),
+        axis.IntCategory(range(10), name="x", flow=False),
+        axis.IntCategory(range(10), name="y", overflow=False),
         axis.IntCategory(range(2), name="z"),
     ).fill(
         x=[3, 3, 3, 4, 5, 5, 5],
         y=[3, 3, 4, 4, 4, 4, 4],
         z=[0, 0, 1, 1, 1, 1, 1],
     )
 
-    if BHV < (1, 4):
-        assert h.axes[0].traits.overflow
-        assert h.axes[1].traits.overflow
-    else:
-        assert not h.axes[0].traits.overflow
-        assert not h.axes[1].traits.overflow
+    assert not h.axes[0].traits.overflow
+    assert not h.axes[1].traits.overflow
     assert h.axes[2].traits.overflow
 
     z_one_only = h[{2: bh.loc(1)}]
@@ -235,21 +229,17 @@ def test_general_fill_int_cat():
 
 def test_general_fill_str_cat():
     h = Hist(
-        axis.StrCategory("FT", name="x", flow=BHV < (1, 4)),
-        axis.StrCategory(list("FT"), name="y", overflow=BHV < (1, 4)),
+        axis.StrCategory("FT", name="x", flow=False),
+        axis.StrCategory(list("FT"), name="y", overflow=False),
         axis.StrCategory(["F", "T"], name="z"),
     ).fill(
         ["T", "T", "T", "T", "T", "F", "T"],
         ["F", "T", "T", "F", "F", "T", "F"],
         ["F", "F", "T", "T", "T", "T", "T"],
     )
 
-    if BHV < (1, 4):
-        assert h.axes[0].traits.overflow
-        assert h.axes[1].traits.overflow
-    else:
-        assert not h.axes[0].traits.overflow
-        assert not h.axes[1].traits.overflow
+    assert not h.axes[0].traits.overflow
+    assert not h.axes[1].traits.overflow
     assert h.axes[2].traits.overflow
 
     z_one_only = h[{2: bh.loc("T")}]
@@ -307,7 +297,7 @@ def test_general_access():
     h = Hist(
         axis.Regular(50, -5, 5, name="Norm", label="normal distribution"),
         axis.Regular(50, -5, 5, name="Unif", label="uniform distribution"),
-        axis.StrCategory(["hi", "hello"], name="Greet", flow=BHV < (1, 4)),
+        axis.StrCategory(["hi", "hello"], name="Greet", flow=False),
         axis.Boolean(name="Yes"),
         axis.Integer(0, 1000, name="Int"),
     ).fill(

tests/test_general.py

@@ -12,7 +12,7 @@
 bhs = pytest.importorskip("boost_histogram.serialization")
 
 BHV = packaging.version.Version(importlib.metadata.version("boost_histogram"))
-BHMETADATA = packaging.version.Version("1.6.1dev0") < BHV
+BHMETADATA = packaging.version.Version("1.6.1") <= BHV
 
 
 @pytest.mark.parametrize(