Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-21761: [Python] accept pyarrow scalars in array constructor #36162

Merged
merged 18 commits into from
Jul 5, 2023
Merged

GH-21761: [Python] accept pyarrow scalars in array constructor #36162

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b54c5a8
First commit - type inference step
AlenkaF Jun 8, 2023
fc00f0b
Second commit - array builder and append step plus tests
AlenkaF Jun 14, 2023
5dc5252
Run linter
AlenkaF Jun 19, 2023
03e8f43
Correct C++ linter errors
AlenkaF Jun 19, 2023
c84c3a4
Apply suggestions from code review - Joris
AlenkaF Jun 20, 2023
c3657c3
Linter corrections second time
AlenkaF Jun 20, 2023
0db8f03
Remove imprt_pyarrow() function and correct one last C++ linter error
AlenkaF Jun 21, 2023
534579f
Try correcting AppVeyor failure
AlenkaF Jun 21, 2023
0263be5
Correct Append step for null scalar
AlenkaF Jun 22, 2023
7a40832
Join two tests
AlenkaF Jun 22, 2023
3da9ba6
One more missing error fix for AppVeyor
AlenkaF Jun 22, 2023
b8cac68
Add unused to keep_going arg of VisitArrowScalar, add a test for date64
AlenkaF Jun 26, 2023
95c4dce
Update python/pyarrow/tests/test_convert_builtin.py
AlenkaF Jun 29, 2023
3273a66
Drop test_array_accepts_pyarrow_scalar_from_compute
AlenkaF Jun 29, 2023
fe77fa0
Remove include of type.h in inference.cc
AlenkaF Jun 29, 2023
40fa78c
Linter corrections
AlenkaF Jun 29, 2023
bfb17c6
Initial attempt to assert values in sets also
AlenkaF Jul 3, 2023
fd0287d
Revert back to skip testing sets
AlenkaF Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions python/pyarrow/tests/test_convert_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2457,14 +2457,29 @@ def test_array_from_pylist_offset_overflow():
)
])
def test_array_accepts_pyarrow_scalar(seq, data, scalar_data, value_type):
if type(seq(scalar_data)) == set:
pytest.skip("TODO: The elements in the set get reordered.")
expect = pa.array(data, type=value_type)
result = pa.array(seq(scalar_data))
assert expect.equals(result)

if type(seq(scalar_data)) == set:
try:
import pyarrow.compute as pc
expect = [expect[a] for a in pc.array_sort_indices(expect).to_pylist()]
result = [result[a] for a in pc.array_sort_indices(result).to_pylist()]
expect == result
except pa.lib.ArrowNotImplementedError:
set(expect) == set(result)
AlenkaF marked this conversation as resolved.
Show resolved Hide resolved
else:
assert expect.equals(result)

result = pa.array(seq(scalar_data), type=value_type)
assert expect.equals(result)
if type(seq(scalar_data)) == set:
try:
result = [result[a] for a in pc.array_sort_indices(result).to_pylist()]
expect == result
except pa.lib.ArrowNotImplementedError:
set(expect) == set(result)
else:
assert expect.equals(result)


@parametrize_with_collections_types
Expand Down