- Update np.unicode_ -> np.str_

- Sort json keys for assertion error message

Author: Mateusz Kopeć

CHANGES.rst

@@ -4,7 +4,7 @@ Release notes
 
 Version 1.0.34, Dec 2024
 ------------------------
-* Support numpy >= 2.0.0 (np.string_ -> np.bytes_).
+* Support numpy >= 2.0.0 (np.string_ -> np.bytes_, np.unicode_ -> np.str_).
 * Fix test utility corner case error (test_numpy.twosigfigs function).
 * Fix typo in build pipeline Python versions config list.
 * Fix 4 failing tests of SparselyBin.

histogrammar/util.py

@@ -318,7 +318,7 @@ def function(datum):
                         context.update(datum)                  # use its items as variables
 
                     # if the datum is a Numpy record array, override the namespace with its field names
-                    elif numpy is not None and isinstance(datum, numpy.core.records.recarray):
+                    elif numpy is not None and isinstance(datum, numpy._core.records.recarray):
                         context.update(dict((n, datum[n]) for n in datum.dtype.names))
 
                     # if the datum is a Pandas DataFrame, override the namespace with its column names

tests/test_numpy.py

@@ -239,7 +239,7 @@ def compare(self, name, hnp, npdata, hpy, pydata):
         hnp.fill.numpy(npdata)
         numpyTime = time.time() - startTime
 
-        if pydata.dtype != numpy.unicode_:
+        if pydata.dtype != numpy.str_:
             for key in npdata:
                 diff = (npdata[key] != npdata2[key]) & numpy.bitwise_not(
                     numpy.isnan(npdata[key])) & numpy.bitwise_not(numpy.isnan(npdata2[key]))
@@ -257,7 +257,7 @@ def compare(self, name, hnp, npdata, hpy, pydata):
 
         startTime = time.time()
         for d in pydata:
-            if isinstance(d, numpy.unicode_):
+            if isinstance(d, numpy.str_):
                 d = str(d)
             else:
                 d = float(d)
@@ -266,7 +266,7 @@ def compare(self, name, hnp, npdata, hpy, pydata):
 
         for h in [hpy2, hpy3, hpy3]:
             for d in pydata:
-                if isinstance(d, numpy.unicode_):
+                if isinstance(d, numpy.str_):
                     d = str(d)
                 else:
                     d = float(d)
@@ -278,8 +278,8 @@ def compare(self, name, hnp, npdata, hpy, pydata):
         assert (hpy + hpy.zero()) == hpy2
         assert (hpy.zero() + hpy) == hpy2
 
-        hnpj = json.dumps(hnp.toJson())
-        hpyj = json.dumps(hpy.toJson())
+        hnpj = json.dumps(hnp.toJson(), sort_keys=True)
+        hpyj = json.dumps(hpy.toJson(), sort_keys=True)
 
         if Factory.fromJson(hnp.toJson()) != Factory.fromJson(hpy.toJson()):
             raise AssertionError("\n numpy: {0}\npython: {1}".format(hnpj, hpyj))