From c8dfd7324d19e39219eb8ff1c5855f052c459854 Mon Sep 17 00:00:00 2001 From: Amanda Potts Date: Fri, 20 Sep 2024 12:14:03 -0400 Subject: [PATCH] debugging CI --- arkouda/pdarraysetops.py | 4 ++-- pytest.ini | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arkouda/pdarraysetops.py b/arkouda/pdarraysetops.py index 294de2826..ddd9596d5 100644 --- a/arkouda/pdarraysetops.py +++ b/arkouda/pdarraysetops.py @@ -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. @@ -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)}" diff --git a/pytest.ini b/pytest.ini index ae58c990c..5b9e8dbba 100644 --- a/pytest.ini +++ b/pytest.ini @@ -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