Skip to content

Commit

Permalink
debugging CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ajpotts committed Sep 20, 2024
1 parent 77ea857 commit c8dfd73
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions arkouda/pdarraysetops.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ def multiarray_setop_validation(
def union1d(
pda1: groupable,
pda2: groupable,
) -> Union[pdarray, groupable]:
) -> groupable:
"""
Find the union of two arrays/List of Arrays.
Expand Down Expand Up @@ -532,7 +532,7 @@ def union1d(
c = [concatenate(x, ordered=False) for x in zip(ua, ub)]
g = GroupBy(c)
k, ct = g.size()
return k
return list(k)
else:
raise TypeError(
f"Both pda1 and pda2 must be pdarray, List, or Tuple. Received {type(pda1)} and {type(pda2)}"
Expand Down
10 changes: 5 additions & 5 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ testpaths =
# tests/numpy/dtypes_test.py
# tests/numpy/numeric_test.py
# tests/numpy/numpy_test.py
# tests/operator_test.py
# tests/pdarray_creation_test.py
# tests/pdarrayclass_test.py
# tests/random_test.py
# tests/regex_test.py
tests/operator_test.py
tests/pdarray_creation_test.py
tests/pdarrayclass_test.py
tests/random_test.py
tests/regex_test.py
tests/scipy/scipy_test.py
tests/security_test.py
tests/segarray_test.py
Expand Down

0 comments on commit c8dfd73

Please sign in to comment.