Skip to content
Open

Fix CI #1913

Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ if "%cuda_compiler_version%"=="None" (
npm install -g azurite
set ARROW_TEST_DATA=%SRC_DIR%\testing\data
set PARQUET_TEST_DATA=%SRC_DIR%\cpp\submodules\parquet-testing\data
ctest --progress --output-on-failure
if %ERRORLEVEL% neq 0 exit 1
ctest --progress --output-on-failure || exit 1
)

popd
4 changes: 4 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ source:
- patches/0003-Change-xsimd-inclusion-criterion.patch
# backport https://github.com/apache/arrow/pull/48261
- patches/0004-GH-48260-C-Python-R-Move-S3-bucket-references-to-new.patch
# avoid setting TZDIR (incorrectly) for orc, which already handles cf's tzdata natively
- patches/0005-don-t-set-TZDIR-for-tests-orc-finds-tzdata-in-conda-.patch

# testing-submodules not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
Expand All @@ -40,6 +42,8 @@ build:
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
# DEBUG
skip: true # [cuda_compiler_version != "None"]

requirements:
build:
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-disable-gcsfs_test.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b7b6283fd8a9905d959a0f25f97293750aa7669c Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sat, 2 Nov 2024 15:41:34 +1100
Subject: [PATCH 1/4] disable gcsfs_test
Subject: [PATCH 1/5] disable gcsfs_test

it cannot work unless we package https://github.com/googleapis/storage-testbench,
which however has extremely tight dependencies on protobuf etc., making it very
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 18258d1295a5e95426ec7b52a6412427d17b114d Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sun, 24 Nov 2024 20:22:35 +1100
Subject: [PATCH 2/4] skip NonExistentBucket test on osx
Subject: [PATCH 2/5] skip NonExistentBucket test on osx

---
cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 37f86532af653cb230ff3b6c8040d6a8577fd3a4 Mon Sep 17 00:00:00 2001
From: AntoinePrv <[email protected]>
Date: Mon, 27 Oct 2025 10:25:58 +0100
Subject: [PATCH 3/4] Change xsimd inclusion criterion
Subject: [PATCH 3/5] Change xsimd inclusion criterion

---
cpp/src/arrow/util/byte_stream_split_internal.h | 4 +++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c4f7a9859aaebc9e7a94fea125e10c7d54d56a30 Mon Sep 17 00:00:00 2001
From: Nic Crane <[email protected]>
Date: Fri, 28 Nov 2025 10:00:28 +0000
Subject: [PATCH 4/4] GH-48260: [C++][Python][R] Move S3 bucket references to
Subject: [PATCH 4/5] GH-48260: [C++][Python][R] Move S3 bucket references to
new bucket as Voltron Data ones will be removed soon (#48261)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From dd1ea3a2ffbf2ee8d3537ffbaa57cf4f14547a80 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Fri, 16 Jan 2026 12:53:03 +1100
Subject: [PATCH 5/5] don't set TZDIR for tests; orc finds tzdata in conda
prefix

---
python/pyarrow/tests/conftest.py | 16 ----------------
1 file changed, 16 deletions(-)

diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
index 575444c1cf..85cb20bc4a 100644
--- a/python/pyarrow/tests/conftest.py
+++ b/python/pyarrow/tests/conftest.py
@@ -55,22 +55,6 @@ if sys.platform == 'win32':
set_timezone_db_path(tzdata_set_path)


-# GH-45295: For ORC, try to populate TZDIR env var from tzdata package resource
-# path.
-#
-# Note this is a different kind of database than what we allow to be set by
-# `PYARROW_TZDATA_PATH` and passed to set_timezone_db_path.
-if sys.platform == 'win32':
- if os.environ.get('TZDIR', None) is None:
- from importlib import resources
- try:
- os.environ['TZDIR'] = os.path.join(resources.files('tzdata'), 'zoneinfo')
- except ModuleNotFoundError:
- print(
- 'Package "tzdata" not found. Not setting TZDIR environment variable.'
- )
-
-
def pytest_addoption(parser):
# Create options to selectively enable test groups
def bool_env(name, default=None):
Loading