Revert "revise valid_index"

This reverts commit b5b92ec.

Author: ddkohler

WrightTools/data/_join.py

@@ -209,7 +209,15 @@ def combine(data, out, item_name, new_idx, transpose, slice_):
             vals[:] = 0
         # Use advanced indexing to populate vals, a temporary array with same shape as out
         valid_index = tuple(wt_kit.valid_index(new_idx, new.shape))
-        vals[valid_index] = old[:].transpose(transpose)[slice_]
+        # temp patch--numpy now doesn't let you write array element with sequence of length 1
+        try:
+            vals[valid_index] = old[:].transpose(transpose)[slice_]
+        except ValueError as e:
+            if all(
+                [isinstance(i, int) for i in valid_index]
+            ):  # temp patch: setting element to array of size 1 used to work
+                valid_index = [[i] for i in valid_index]
+                vals[valid_index] = old[:].transpose(transpose)[slice_]
 
         # Overlap methods are accomplished by adding the existing array with the one added
         # for this particular data. Thus locations which should be set, but conflict by

WrightTools/kit/_array.py

@@ -385,7 +385,7 @@ def valid_index(index, shape) -> tuple:
             if isinstance(i, slice):
                 out.append(slice(None))
             else:
-                out.append([0])
+                out.append(0)
         else:
             out.append(i)
     return tuple(out[::-1])

tests/data/join.py

@@ -713,6 +713,7 @@ def test_transpose():
     test_1D_plus_2D_plus_3D()
     test_overlap_first()
     test_overlap_last()
+    test_overlap_sum()
     test_overlap_max()
     test_overlap_min()
     test_overlap_mean()

tests/kit/valid_index.py

@@ -18,7 +18,7 @@ def test__1_5__7():
 def test__4_2_12__1_25_1():
     index = (4, 2, 12)
     shape = (1, 25, 1)
-    assert wt.kit.valid_index(index, shape) == ([0], 2, [0])
+    assert wt.kit.valid_index(index, shape) == (0, 2, 0)
 
 
 def test__s__23():