feat: new simpler Python 3.6+ family usage (#513)

* feat: new simpler Python 3.6+ family usage

* docs: changelog update

Author: henryiii

docs/CHANGELOG.md

@@ -3,10 +3,20 @@
 ## Version 1.0
 
 Dropped support for Python 2 and 3.5; removed large numbers of workarounds.
+Subclassing histogram components now uses Python 3 class keyword syntax to set
+families.
 
+#### User changes
+
+* Dropped Python 2.7 and 3.5 support [#512][]
 * Removed deprecated `.options` from axes. Use `.traits` instead. [#503][]
+* Use keyword class family setting when subclassing histogram components
+  instead of custom decorator. [#513][]
 
 [#503]: https://github.com/scikit-hep/boost-histogram/pull/503
+[#512]: https://github.com/scikit-hep/boost-histogram/pull/512
+[#513]: https://github.com/scikit-hep/boost-histogram/pull/513
+
 
 ## Version 0.13
 

src/boost_histogram/__init__.py

@@ -1,4 +1,4 @@
-from . import accumulators, axis, numpy, storage, utils
+from . import accumulators, axis, numpy, storage
 from ._internal.enum import Kind
 from ._internal.hist import Histogram
 from .tag import loc, overflow, rebin, sum, underflow
@@ -24,7 +24,6 @@
     "axis",
     "storage",
     "accumulators",
-    "utils",
     "numpy",
     "loc",
     "rebin",

src/boost_histogram/_internal/axis.py

@@ -1,10 +1,12 @@
 import copy
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Optional, Set, Tuple, Union
+
+import boost_histogram
 
 from .._core import axis as ca
 from .axis_transform import AxisTransform
 from .traits import Traits
-from .utils import MAIN_FAMILY, cast, register, set_family, set_module
+from .utils import cast, register, set_module
 
 
 def _isstr(value: Any) -> bool:
@@ -20,14 +22,19 @@ def _isstr(value: Any) -> bool:
         return False
 
 
-def opts(**kwargs: bool):
+def opts(**kwargs: bool) -> Set[str]:
     return {k for k, v in kwargs.items() if v}
 
 
 # Contains common methods and properties to all axes
 @set_module("boost_histogram.axis")
 class Axis:
     __slots__ = ("_ax", "__dict__")
+    _family: object
+
+    def __init_subclass__(cls, *, family: object) -> None:
+        super().__init_subclass__()
+        cls._family = family
 
     def __setattr__(self, attr: str, value: Any) -> None:
         if attr == "__dict__":
@@ -244,8 +251,7 @@ def widths(self):
     }
 )
 @set_module("boost_histogram.axis")
-@set_family(MAIN_FAMILY)
-class Regular(Axis):
+class Regular(Axis, family=boost_histogram):
     __slots__ = ()
 
     def __init__(
@@ -361,9 +367,8 @@ def transform(self) -> Optional[AxisTransform]:
         ca.variable_circular,
     }
 )
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis")
-class Variable(Axis):
+class Variable(Axis, family=boost_histogram):
     __slots__ = ()
 
     def __init__(
@@ -444,9 +449,8 @@ def _repr_args(self) -> str:
         ca.integer_circular,
     }
 )
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis")
-class Integer(Axis):
+class Integer(Axis, family=boost_histogram):
     __slots__ = ()
 
     def __init__(
@@ -514,7 +518,7 @@ def _repr_args(self):
         return "{start:g}, {stop:g}".format(start=self.edges[0], stop=self.edges[-1])
 
 
-class BaseCategory(Axis):
+class BaseCategory(Axis, family=boost_histogram):
     __slots__ = ()
 
     def _repr_kwargs(self):
@@ -536,10 +540,9 @@ def _repr_kwargs(self):
         return ret
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis")
 @register({ca.category_str_growth, ca.category_str})
-class StrCategory(BaseCategory):
+class StrCategory(BaseCategory, family=boost_histogram):
     __slots__ = ()
 
     def __init__(
@@ -603,10 +606,9 @@ def _repr_args(self):
         return "[{}]".format(", ".join(repr(c) for c in self))
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis")
 @register({ca.category_int, ca.category_int_growth})
-class IntCategory(BaseCategory):
+class IntCategory(BaseCategory, family=boost_histogram):
     __slots__ = ()
 
     def __init__(
@@ -655,9 +657,8 @@ def _repr_args(self) -> str:
 
 # Contains all common methods and properties for the boolean axis
 @register({ca.boolean})
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis")
-class Boolean(Axis):
+class Boolean(Axis, family=boost_histogram):
     __slots__ = ()
 
     def __init__(self, *, metadata: Any = None, __dict__: Dict[str, Any] = None):

src/boost_histogram/_internal/axis_transform.py

@@ -1,13 +1,20 @@
 import copy
 from typing import Any
 
+import boost_histogram
+
 from .._core import axis as ca
-from .utils import MAIN_FAMILY, register, set_family, set_module
+from .utils import register, set_module
 
 
 @set_module("boost_histogram.axis.transform")
 class AxisTransform:
     __slots__ = ("_this",)
+    _family: object
+
+    def __init_subclass__(cls, *, family: object) -> None:
+        super().__init_subclass__()
+        cls._family = family
 
     def __copy__(self):
         other = self.__class__.__new__(self.__class__)
@@ -33,7 +40,7 @@ def _produce(self, bins: int, start: int, stop: int) -> Any:
 
     def __init__(self) -> None:
         "Create a new transform instance"
-        # Note: this comes from set_family
+        # Note: this comes from family
         (cpp_class,) = self._types  # type: ignore
         self._this = cpp_class()
 
@@ -49,16 +56,15 @@ def inverse(self, value):
 core = "__init__ forward inverse".split()
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis.transform")
 @register({ca.transform.pow})
-class Pow(AxisTransform):
+class Pow(AxisTransform, family=boost_histogram):
     __slots__ = ()
     _type = ca.regular_pow
 
     def __init__(self, power: float):
         "Create a new transform instance"
-        # Note: this comes from set_family
+        # Note: this comes from family
         (cpp_class,) = self._types  # type: ignore
         self._this = cpp_class(power)
 
@@ -72,10 +78,9 @@ def _produce(self, bins, start, stop):
         return self.__class__._type(bins, start, stop, self.power)
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.axis.transform")
 @register({ca.transform.func_transform})
-class Function(AxisTransform):
+class Function(AxisTransform, family=boost_histogram):
     __slots__ = ()
     _type = ca.regular_trans
 
@@ -126,7 +131,7 @@ def log(x):
 
         """
 
-        # Note: this comes from set_family
+        # Note: this comes from family
         (cpp_class,) = self._types  # type: ignore
         self._this = cpp_class(forward, inverse, convert, name)
 

src/boost_histogram/_internal/hist.py

@@ -6,12 +6,14 @@
 
 import numpy as np
 
+import boost_histogram
+
 from .. import _core
 from .axestuple import AxesTuple
 from .axis import Axis
 from .enum import Kind
 from .storage import Double, Storage
-from .utils import MAIN_FAMILY, cast, register, set_family, set_module
+from .utils import cast, register, set_module
 from .view import _to_view
 
 if TYPE_CHECKING:
@@ -83,7 +85,6 @@ def _expand_ellipsis(indexes, rank):
 # We currently do not cast *to* a histogram, but this is consistent
 # and could be used later.
 @register(_histograms)
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram")
 class Histogram:
     # Note this is a __slots__ __dict__ class!
@@ -94,6 +95,12 @@ class Histogram:
     )
     # .metadata and ._variance_known are part of the dict
 
+    _family: object = boost_histogram
+
+    def __init_subclass__(cls, *, family: object) -> None:
+        super().__init_subclass__()
+        cls._family = family
+
     def __init__(
         self,
         *axes: Axis,

src/boost_histogram/_internal/storage.py

@@ -1,53 +1,51 @@
+import boost_histogram
+
 from .._core import storage as store
-from .utils import MAIN_FAMILY, set_family, set_module
+from .utils import set_module
 
 
 # Simple mixin to provide a common base class for types
 class Storage:
-    def __repr__(self):
-        return f"{self.__class__.__name__}()"
+    _family: object
 
+    def __init_subclass__(cls, *, family: object) -> None:
+        super().__init_subclass__()
+        cls._family = family
 
-# MAIN FAMILY
+    def __repr__(self):
+        return f"{self.__class__.__name__}()"
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class Int64(store.int64, Storage):
+class Int64(store.int64, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class Double(store.double, Storage):
+class Double(store.double, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class AtomicInt64(store.atomic_int64, Storage):
+class AtomicInt64(store.atomic_int64, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class Unlimited(store.unlimited, Storage):
+class Unlimited(store.unlimited, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class Weight(store.weight, Storage):
+class Weight(store.weight, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class Mean(store.mean, Storage):
+class Mean(store.mean, Storage, family=boost_histogram):
     pass
 
 
-@set_family(MAIN_FAMILY)
 @set_module("boost_histogram.storage")
-class WeightedMean(store.weighted_mean, Storage):
+class WeightedMean(store.weighted_mean, Storage, family=boost_histogram):
     pass