Skip to content

Commit 739ee7b

Browse files
committed
Comment improvements and remove stray import
1 parent 1a9c8e7 commit 739ee7b

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

ci/pixi/asan/cpp/pixi.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ binutils = "*"
3636
cmake = "*"
3737

3838
[feature.test.tasks]
39-
# This path mangling feels extremely finicky. Investigate alternatives to make this more robust.
39+
# This path depends on pixi-build's internal work-directory layout.
40+
# Required for running C++ tests on Docker.
4041
test = "cd $(ls -d /arrow/ci/pixi/asan/cpp/.pixi/build/work/arrow-cpp-*/work/build | head -n 1) && ctest --output-on-failure"
4142

4243
[package]
@@ -71,8 +72,7 @@ extra-args = [
7172
"-DARROW_WITH_SNAPPY=ON",
7273
"-DARROW_WITH_ZLIB=ON",
7374
"-DARROW_WITH_ZSTD=ON",
74-
# libutf8proc on package-host-dependencies seems to fail.
75-
# More investigation needed. In the meantime use bundled.
75+
# libutf8proc on package-host-dependencies fails use Bundled.
7676
"-Dutf8proc_SOURCE=BUNDLED",
7777
"-DOPENSSL_ROOT_DIR=$PREFIX",
7878
]

ci/pixi/default/cpp/pixi.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@
1717

1818
[workspace]
1919
channels = ["https://prefix.dev/conda-forge"]
20-
platforms = ["linux-64", "linux-aarch64", "osx-arm64"]
20+
platforms = ["linux-64"]
2121
preview = ["pixi-build"]
2222

2323
[environments]
2424
test = ["test"]
2525

26-
[feature.test.activation.env]
26+
[feature.test.activation.env]
2727
ARROW_TEST_DATA = "/arrow/testing/data"
2828
PARQUET_TEST_DATA = "/arrow/cpp/submodules/parquet-testing/data"
2929

3030
[feature.test.dependencies]
3131
binutils = "*"
3232
cmake = "*"
33-
33+
3434
[feature.test.tasks]
35-
# This path mangling feels extremely finicky. Investigate alternatives to make this more robust.
35+
# This path depends on pixi-build's internal work-directory layout.
36+
# Required for running C++ tests on Docker.
3637
test = "cd $(ls -d /arrow/ci/pixi/default/cpp/.pixi/build/work/arrow-cpp-*/work/build | head -n 1) && ctest --output-on-failure"
37-
38+
3839
[package]
3940
name = "arrow-cpp"
4041
version = "25.0.0a0"
@@ -63,8 +64,7 @@ extra-args = [
6364
"-DARROW_WITH_SNAPPY=ON",
6465
"-DARROW_WITH_ZLIB=ON",
6566
"-DARROW_WITH_ZSTD=ON",
66-
# libutf8proc on package-host-dependencies seems to fail.
67-
# More investigation needed. In the meantime use bundled.
67+
# libutf8proc on package-host-dependencies fails use Bundled.
6868
"-Dutf8proc_SOURCE=BUNDLED",
6969
"-DOPENSSL_ROOT_DIR=$PREFIX",
7070
]

ci/pixi/default/python/pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[workspace]
1919
channels = ["https://prefix.dev/conda-forge"]
20-
platforms = ["linux-64", "linux-aarch64", "osx-arm64"]
20+
platforms = ["linux-64"]
2121
preview = ["pixi-build"]
2222

2323
[environments]

python/pyarrow/lib.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import os
2929
import sys
3030

3131
from cython.operator cimport dereference as deref
32-
from libc.stdlib cimport malloc, free
3332
from pyarrow.includes.libarrow cimport *
3433
from pyarrow.includes.libarrow_python cimport *
3534
from pyarrow.includes.common cimport PyObject_to_object

python/pyarrow/tests/test_memory.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,21 @@ def check_debug_memory_pool_disabled(pool_factory, env_value, msg):
257257
assert msg in res.stderr
258258

259259

260-
# Asan test fails as we are doing an out-of-bounds write.
260+
# Asan test fails as we are deliberately doing an out-of-bounds write.
261261
@pytest.mark.noasan
262262
@pytest.mark.parametrize('pool_factory', supported_factories())
263263
def test_debug_memory_pool_none(pool_factory):
264264
check_debug_memory_pool_disabled(pool_factory, "none", "")
265265

266266

267-
# Asan test fails as we are doing an out-of-bounds write.
267+
# Asan test fails as we are deliberately doing an out-of-bounds write.
268268
@pytest.mark.noasan
269269
@pytest.mark.parametrize('pool_factory', supported_factories())
270270
def test_debug_memory_pool_empty(pool_factory):
271271
check_debug_memory_pool_disabled(pool_factory, "", "")
272272

273273

274-
# Asan test fails as we are doing an out-of-bounds write.
274+
# Asan test fails as we are deliberately doing an out-of-bounds write.
275275
@pytest.mark.noasan
276276
@pytest.mark.parametrize('pool_factory', supported_factories())
277277
def test_debug_memory_pool_unknown(pool_factory):

0 commit comments

Comments
 (0)