fix(backport): partial backport of metadata fix from #518

Author: henryiii

src/boost_histogram/_internal/axis.py

@@ -170,6 +170,12 @@ def _repr_kwargs(self):
             if not self.traits.overflow:
                 ret += ", overflow=False"
 
+        if self.metadata is not None:
+            if isinstance(self.metadata, string_types):
+                ret += ", metadata={!r}".format(self.metadata)
+            else:
+                ret += ", metadata=..."
+
         return ret
 
     @deprecated("Use .traits instead", name="options")
@@ -536,6 +542,12 @@ def _repr_kwargs(self):
         elif self.traits.circular:
             ret += ", circular=True"
 
+        if self.metadata is not None:
+            if isinstance(self.metadata, string_types):
+                ret += ", metadata={!r}".format(self.metadata)
+            else:
+                ret += ", metadata=..."
+
         return ret
 
 
@@ -698,4 +710,11 @@ def _repr_kwargs(self):
         just in case it spans multiple lines.
         """
 
-        return ""
+        ret = ""
+        if self.metadata is not None:
+            if isinstance(self.metadata, string_types):
+                ret += ", metadata={!r}".format(self.metadata)
+            else:
+                ret += ", metadata=..."
+
+        return ret

tests/test_axis.py

@@ -223,16 +223,16 @@ def test_repr(self):
         assert repr(ax) == "Regular(4, 1.1, 2.2)"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, metadata="ra")
-        assert repr(ax) == "Regular(4, 1.1, 2.2)"
+        assert repr(ax) == "Regular(4, 1.1, 2.2, metadata='ra')"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, underflow=False)
         assert repr(ax) == "Regular(4, 1.1, 2.2, underflow=False)"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, metadata="ra", overflow=False)
-        assert repr(ax) == "Regular(4, 1.1, 2.2, overflow=False)"
+        assert repr(ax) == "Regular(4, 1.1, 2.2, overflow=False, metadata='ra')"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, metadata="ra", circular=True)
-        assert repr(ax) == "Regular(4, 1.1, 2.2, circular=True)"
+        assert repr(ax) == "Regular(4, 1.1, 2.2, circular=True, metadata='ra')"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, transform=bh.axis.transform.log)
         assert repr(ax) == "Regular(4, 1.1, 2.2, transform=log)"
@@ -407,7 +407,7 @@ def test_repr(self):
         assert repr(ax) == "Regular(4, 1.1, 2.2, circular=True)"
 
         ax = bh.axis.Regular(4, 1.1, 2.2, metadata="hi", circular=True)
-        assert repr(ax) == "Regular(4, 1.1, 2.2, circular=True)"
+        assert repr(ax) == "Regular(4, 1.1, 2.2, circular=True, metadata='hi')"
 
     def test_getitem(self):
         a = bh.axis.Regular(2, 1, 1 + np.pi * 2, circular=True)
@@ -520,7 +520,7 @@ def test_repr(self):
         assert repr(a) == "Variable([-0.1, 0.2])"
 
         a = bh.axis.Variable([-0.1, 0.2], metadata="hi")
-        assert repr(a) == "Variable([-0.1, 0.2])"
+        assert repr(a) == "Variable([-0.1, 0.2], metadata='hi')"
 
     def test_getitem(self):
         ref = [-0.1, 0.2, 0.3]
@@ -639,7 +639,10 @@ def test_repr(self):
         assert repr(a) == "Integer(-1, 1)"
 
         a = bh.axis.Integer(-1, 1, metadata="hi")
-        assert repr(a) == "Integer(-1, 1)"
+        assert repr(a) == "Integer(-1, 1, metadata='hi')"
+
+        a = bh.axis.Integer(-1, 1, metadata=2)
+        assert repr(a) == "Integer(-1, 1, metadata=...)"
 
         a = bh.axis.Integer(-1, 1, underflow=False)
         assert repr(a) == "Integer(-1, 1, underflow=False)"
@@ -763,14 +766,14 @@ def test_repr(self):
         assert repr(ax) == "IntCategory([1, 2, 3])"
 
         ax = bh.axis.IntCategory([1, 2, 3], metadata="foo")
-        assert repr(ax) == "IntCategory([1, 2, 3])"
+        assert repr(ax) == "IntCategory([1, 2, 3], metadata='foo')"
 
         ax = bh.axis.StrCategory("ABC", metadata="foo")
         # If unicode is the default (Python 3, generally)
         if type("") == type(u""):  # noqa: E721
-            assert repr(ax) == "StrCategory(['A', 'B', 'C'])"
+            assert repr(ax) == "StrCategory(['A', 'B', 'C'], metadata='foo')"
         else:
-            assert repr(ax) == "StrCategory([u'A', u'B', u'C'])"
+            assert repr(ax) == "StrCategory([u'A', u'B', u'C'], metadata='foo')"
 
     @pytest.mark.parametrize("ref", ([1, 2, 3], "ABC"))
     def test_getitem(self, ref, growth):
@@ -868,7 +871,7 @@ def test_repr(self):
         assert repr(a) == "Boolean()"
 
         a = bh.axis.Boolean(metadata="hi")
-        assert repr(a) == "Boolean()"
+        assert repr(a) == "Boolean(, metadata='hi')"
 
     def test_label(self):
         a = bh.axis.Boolean(metadata="foo")