Skip to content

Commit ef94310

Browse files
chore(deps): lock file maintenance (#4349)
This PR contains the following updates: | Update | Change | |---|---| | lockFileMaintenance | All locks refreshed | 🔧 This Pull Request updates lock files to use the latest dependency versions. --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/vortex-data/vortex). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS44Mi43IiwidXBkYXRlZEluVmVyIjoiNDEuODIuNyIsInRhcmdldEJyYW5jaCI6ImRldmVsb3AiLCJsYWJlbHMiOlsiY2hvcmUiXX0=--> --------- Signed-off-by: Daniel King <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel King <[email protected]>
1 parent 9884295 commit ef94310

File tree

11 files changed

+212
-160
lines changed

11 files changed

+212
-160
lines changed

Cargo.lock

Lines changed: 81 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java/testfiles/Cargo.lock

Lines changed: 33 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uv.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vortex-python/python/vortex/arrays.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __ArrowDtype_type_patched(self: pandas.ArrowDtype):
4141

4242

4343
def empty_arrow_table(schema: pyarrow.Schema) -> pyarrow.Table:
44-
return pyarrow.Table.from_arrays([pyarrow.array([], type=t) for t in schema], schema=schema) # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType, reportUnknownArgumentType]
44+
return pyarrow.Table.from_arrays([pyarrow.array([], type=t) for t in schema], schema=schema) # pyright: ignore[reportUnknownVariableType, reportUnknownArgumentType]
4545

4646

4747
def arrow_table_from_struct_array(

vortex-python/python/vortex/dataset.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ def from_path(path: str):
4545
def schema(self) -> pyarrow.Schema:
4646
return self._dataset.schema()
4747

48-
# regarding the ignore: https://github.com/zen-xu/pyarrow-stubs/pull/258
4948
@override
50-
def count_rows( # pyright: ignore[reportIncompatibleMethodOverride]
49+
def count_rows(
5150
self,
5251
filter: pyarrow.dataset.Expression | Expr | None = None,
5352
batch_size: int | None = None,
@@ -546,6 +545,7 @@ def scanner(
546545
@override
547546
def to_batches(
548547
self,
548+
schema: pyarrow.Schema | None = None,
549549
columns: list[str] | None = None,
550550
filter: pyarrow.dataset.Expression | Expr | None = None,
551551
batch_size: int | None = None,
@@ -557,6 +557,8 @@ def to_batches(
557557
memory_pool: pyarrow.MemoryPool | None = None,
558558
) -> Iterator[pyarrow.RecordBatch]:
559559
"""See :class:`vortex.dataset.VortexDataset.scanner`"""
560+
if schema:
561+
raise ValueError("schema is not supported")
560562
return self._dataset.to_batches(
561563
columns=columns,
562564
filter=filter,
@@ -572,6 +574,7 @@ def to_batches(
572574
@override
573575
def to_table(
574576
self,
577+
schema: pyarrow.Schema | None = None,
575578
columns: list[str] | None = None,
576579
filter: pyarrow.dataset.Expression | Expr | None = None,
577580
batch_size: int | None = None,
@@ -583,6 +586,8 @@ def to_table(
583586
memory_pool: pyarrow.MemoryPool | None = None,
584587
) -> pyarrow.Table:
585588
"""See :class:`vortex.dataset.VortexDataset.scanner`"""
589+
if schema:
590+
raise ValueError("schema is not supported")
586591
return self._dataset.to_table(
587592
columns=columns,
588593
filter=filter,

vortex-python/test/bench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def arrow_array(request): # pyright: ignore[reportUnknownParameterType, reportM
3636
# Create large arrays of length 100 for each column.
3737
r[f"col{col}"] = [1, 2, None, 4] * 25
3838
rows.append(r)
39-
return pa.Table.from_pylist(rows) # pyright: ignore[reportUnknownMemberType]
39+
return pa.Table.from_pylist(rows)
4040

4141

4242
def test_compress_vortex(benchmark: Callable[[Callable[[], None]], None], vortex_array: vx.Array):

vortex-python/test/test_dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_to_table(ds: pd.Dataset):
8888
tbl = ds.to_table(columns=["bool", "float"], filter=pc.field("float") > 100)
8989
# TODO(aduffy): add back once pyarrow supports casting to/from string_view
9090
# assert 0 == len(tbl.filter(pc.field("string") <= "10000"))
91-
assert tbl.slice(0, 10) == pa.Table.from_struct_array( # pyright: ignore[reportUnknownMemberType]
91+
assert tbl.slice(0, 10) == pa.Table.from_struct_array(
9292
pa.array([record(x, columns={"float", "bool"}) for x in range(10001, 10011)])
9393
)
9494

@@ -191,7 +191,7 @@ def test_fragment_to_table(ds: vx.dataset.VortexDataset):
191191
f = fragments[0]
192192

193193
tbl = f.to_table(columns=["bool", "float"], filter=pc.field("float") > 100)
194-
assert tbl.slice(0, 10) == pa.Table.from_struct_array( # pyright: ignore[reportUnknownMemberType]
194+
assert tbl.slice(0, 10) == pa.Table.from_struct_array(
195195
pa.array([record(x, columns={"float", "bool"}) for x in range(10001, 10011)])
196196
)
197197

vortex-python/test/test_datasource.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_vortex_datasource(tmpdir_factory): # pyright: ignore[reportUnknownPara
4747
# Without an explicit sort, Ray may reorder rows *even within a single record batch*.
4848
ds = ds.sort("index")
4949

50-
tbl = pa.concat_tables(pa.Table.from_pydict(x) for x in ds.iter_batches()) # pyright: ignore[reportUnknownMemberType, reportArgumentType]
51-
expected = pa.Table.from_pylist([record(x) for x in range(0, 10)], schema=tbl.schema) # pyright: ignore[reportUnknownMemberType]
50+
tbl = pa.concat_tables(pa.Table.from_pydict(x) for x in ds.iter_batches()) # pyright: ignore[reportArgumentType]
51+
expected = pa.Table.from_pylist([record(x) for x in range(0, 10)], schema=tbl.schema)
5252

5353
assert tbl == expected

vortex-python/test/test_encodings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ def test_struct():
1212
"""
1313

1414
# basic usage
15-
array = pa.Table.from_arrays([pa.array(["1", "2", "3"]), pa.array([1.0, 2.0, 3.0])], names=["strings", "floats"]) # pyright: ignore[reportUnknownMemberType]
15+
array = pa.Table.from_arrays([pa.array(["1", "2", "3"]), pa.array([1.0, 2.0, 3.0])], names=["strings", "floats"])
1616
vxarray = vortex.array(array)
1717
assert isinstance(vxarray, vortex.ChunkedArray)
1818
struct_array = vxarray.chunks()[0]
1919
assert isinstance(struct_array, vortex.StructArray)
2020
assert struct_array.names() == ["strings", "floats"]
2121

2222
# advanced: duplicate field names
23-
array = pa.Table.from_arrays( # pyright: ignore[reportUnknownMemberType]
23+
array = pa.Table.from_arrays(
2424
[pa.array(["1", "2", "3"]), pa.array([1.0, 2.0, 3.0]), pa.array(["one", "two", "three"])],
2525
names=["strings", "floats", "strings"],
2626
)

0 commit comments

Comments
 (0)