Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '19'
- '21'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -35,7 +35,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '19'
- '21'
gflags:
- '2.2'
glog:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '19'
- '21'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -35,7 +35,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '19'
- '21'
gflags:
- '2.2'
glog:
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ cmake -GNinja \
-DARROW_WITH_ZSTD=ON \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=${CMAKE_INTERPROCEDURAL_OPTIMIZATION} \
Expand Down
4 changes: 2 additions & 2 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ libarrow_all:

# on osx, keep this in sync with llvm_version in meta.yaml.
c_compiler_version: # [osx]
- 19 # [osx]
- 21 # [osx]
cxx_compiler_version: # [osx]
- 19 # [osx]
- 21 # [osx]
22 changes: 9 additions & 13 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% set version = "22.0.0" %}
{% set version = "23.0.0" %}
{% set cuda_enabled = cuda_compiler_version != "None" %}
{% set build_ext_version = "5.0.0" %}
{% set build_ext = "cuda" if cuda_enabled else "cpu" %}
{% set proc_build_number = "0" %}
{% set llvm_version = "19" %}
{% set llvm_version = "21" %}

# see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90
{% set so_version = (version.split(".")[0] | int * 100 + version.split(".")[1] | int) ~ "." ~ version.split(".")[2] ~ ".0" %}
Expand All @@ -15,34 +15,30 @@ package:
source:
- url: https://www.apache.org/dyn/closer.lua/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz?action=download
fn: apache-arrow-{{ version }}.tar.gz
sha256: 131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f
sha256: 12f6844a0ba3b99645cd2bc6cc4f44f6a174ab90da37e474f08b7d073433cb60
patches:
# skip gcsfs tests due to missing `storage-testbench`
- patches/0001-disable-gcsfs_test.patch
# upstream problems on with s3 tests on osx, see
# https://github.com/apache/arrow/issues/35587
- patches/0002-skip-NonExistentBucket-test-on-osx.patch
# for correctly including xsimd headers
- 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
# backport https://github.com/apache/arrow/pull/48895
- patches/0005-GH-48894-Python-C-Use-base-Azure-Core-RequestFailedE.patch
# backport https://github.com/apache/arrow/pull/48601; needs C++20
- patches/0006-GH-48593-C-C-20-use-standard-calendar-timezone-APIs.patch # [win]
- patches/0003-GH-48894-Python-C-Use-base-Azure-Core-RequestFailedE.patch
# backport https://github.com/apache/arrow/pull/48601
- patches/0004-GH-48593-C-C-20-use-standard-calendar-timezone-APIs.patch
# disable gandiva tests that are "unmaintained" and failing on windows
- patches/0007-disable-some-gandiva-tests-related-to-tzdb-handling.patch # [win]
- patches/0005-disable-some-gandiva-tests-related-to-tzdb-handling.patch # [win]

# testing-submodules not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
git_rev: 9a02925d1ba80bd493b6d4da6e8a777588d57ac4
git_rev: 19dda67f485ffb3ffa92f4c6fa083576ef052d58
folder: testing
- git_url: https://github.com/apache/parquet-testing.git
git_rev: a3d96a65e11e2bbca7d22a894e8313ede90a33a3
folder: cpp/submodules/parquet-testing

build:
number: 9
number: 0
# 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)]
Expand Down
18 changes: 12 additions & 6 deletions recipe/patches/0001-disable-gcsfs_test.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
From b7b6283fd8a9905d959a0f25f97293750aa7669c Mon Sep 17 00:00:00 2001
From 8e54e12c2954360c1552509c712c1a392708564d Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sat, 2 Nov 2024 15:41:34 +1100
Subject: [PATCH 1/7] 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
hard to fit this into our migration patterns
---
cpp/src/arrow/filesystem/CMakeLists.txt | 8 --------
1 file changed, 8 deletions(-)
cpp/src/arrow/filesystem/CMakeLists.txt | 14 --------------
1 file changed, 14 deletions(-)

diff --git a/cpp/src/arrow/filesystem/CMakeLists.txt b/cpp/src/arrow/filesystem/CMakeLists.txt
index 5250ed2a88..ba053bd501 100644
index e6330df426..68f95b8b42 100644
--- a/cpp/src/arrow/filesystem/CMakeLists.txt
+++ b/cpp/src/arrow/filesystem/CMakeLists.txt
@@ -42,14 +42,6 @@ if(ARROW_BUILD_BENCHMARKS)
@@ -42,20 +42,6 @@ if(ARROW_BUILD_BENCHMARKS)
${ARROW_BENCHMARK_LINK_LIBS})
endif()

Expand All @@ -24,6 +24,12 @@ index 5250ed2a88..ba053bd501 100644
- filesystem
- EXTRA_LINK_LIBS
- google-cloud-cpp::storage)
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
- if(TARGET arrow-gcsfs-test)
- target_compile_options(arrow-gcsfs-test PRIVATE -Wno-documentation
- -Wno-documentation-deprecated-sync)
- endif()
- endif()
-endif()
-
if(ARROW_AZURE)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 18258d1295a5e95426ec7b52a6412427d17b114d Mon Sep 17 00:00:00 2001
From 0420ba3d4af352103ec4b5a31cc7f95470e60dc8 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sun, 24 Nov 2024 20:22:35 +1100
Subject: [PATCH 2/7] skip NonExistentBucket test on osx
Subject: [PATCH 2/5] skip NonExistentBucket test on osx

---
cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/cpp/src/arrow/filesystem/s3fs_test.cc b/cpp/src/arrow/filesystem/s3fs_test.cc
index f0a5d0e2e4..b5578b4f74 100644
index f7c125c896..3eb898ea71 100644
--- a/cpp/src/arrow/filesystem/s3fs_test.cc
+++ b/cpp/src/arrow/filesystem/s3fs_test.cc
@@ -438,6 +438,10 @@ TEST_F(S3RegionResolutionTest, RestrictedBucket) {
Expand Down
24 changes: 0 additions & 24 deletions recipe/patches/0003-Change-xsimd-inclusion-criterion.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 407552a97befc16add72c08c05c439d2ddfada06 Mon Sep 17 00:00:00 2001
From 1208d461bf2c3b241f993758de5ab9287d638aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 20 Jan 2026 15:32:01 +0100
Subject: [PATCH 5/7] GH-48894: [Python][C++] Use base
Subject: [PATCH 3/5] GH-48894: [Python][C++] Use base
Azure::Core::RequestFailedException instead of final
Azure::Storage::StorageException and set minimum nodejs on conda env to 16
for Azurite to work (#48895)
Expand Down Expand Up @@ -60,7 +60,7 @@ Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt
index 6e23e920a4..afb9447d5e 100644
index 18d58f7bb2..fec8488f95 100644
--- a/ci/conda_env_cpp.txt
+++ b/ci/conda_env_cpp.txt
@@ -39,7 +39,7 @@ lz4-c
Expand All @@ -73,7 +73,7 @@ index 6e23e920a4..afb9447d5e 100644
pkg-config
python
diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index 0ca18eed51..047247b651 100644
index a3a162616e..6580476d38 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc
+++ b/cpp/src/arrow/filesystem/azurefs.cc
@@ -558,7 +558,7 @@ Status CrossContainerMoveNotImplemented(const AzureLocation& src,
Expand Down
Loading
Loading