Merge pull request conda-forge#1819 from regro-cf-autotick-bot/21.0.0_h0f9ac5

arrow-cpp v21.0.0

Author: h-vetinari

README.md

@@ -11,7 +11,6 @@ if [%PKG_NAME%] == [libarrow] (
     move .\temp_prefix\lib\arrow_cuda.lib %LIBRARY_LIB% || true
     move .\temp_prefix\bin\arrow_cuda.dll %LIBRARY_BIN% || true
     copy .\temp_prefix\lib\pkgconfig\arrow.pc %LIBRARY_LIB%\pkgconfig
-    copy .\temp_prefix\lib\pkgconfig\arrow-compute.pc %LIBRARY_LIB%\pkgconfig
     copy .\temp_prefix\lib\pkgconfig\arrow-csv.pc %LIBRARY_LIB%\pkgconfig
     copy .\temp_prefix\lib\pkgconfig\arrow-cuda.pc %LIBRARY_LIB%\pkgconfig || true
     copy .\temp_prefix\lib\pkgconfig\arrow-filesystem.pc %LIBRARY_LIB%\pkgconfig
@@ -33,6 +32,12 @@ if [%PKG_NAME%] == [libarrow] (
     copy .\temp_prefix\lib\pkgconfig\arrow-acero.pc %LIBRARY_LIB%\pkgconfig
     mkdir %LIBRARY_LIB%\cmake\ArrowAcero
     move .\temp_prefix\lib\cmake\ArrowAcero\* %LIBRARY_LIB%\cmake\ArrowAcero
+) else if [%PKG_NAME%] == [libarrow-compute] (
+    move .\temp_prefix\lib\arrow_compute.lib %LIBRARY_LIB%
+    move .\temp_prefix\bin\arrow_compute.dll %LIBRARY_BIN%
+    copy .\temp_prefix\lib\pkgconfig\arrow-compute.pc %LIBRARY_LIB%\pkgconfig
+    mkdir %LIBRARY_LIB%\cmake\ArrowCompute
+    move .\temp_prefix\lib\cmake\ArrowCompute\* %LIBRARY_LIB%\cmake\ArrowCompute
 ) else if [%PKG_NAME%] == [libarrow-dataset] (
     move .\temp_prefix\lib\arrow_dataset.lib %LIBRARY_LIB%
     move .\temp_prefix\bin\arrow_dataset.dll %LIBRARY_BIN%

recipe/install-libarrow.bat

@@ -11,7 +11,6 @@ if [[ "${PKG_NAME}" == "libarrow" ]]; then
     cp -a ./temp_prefix/lib/libarrow.* $PREFIX/lib
     cp -a ./temp_prefix/lib/libarrow_cuda.* $PREFIX/lib || true
     cp ./temp_prefix/lib/pkgconfig/arrow.pc $PREFIX/lib/pkgconfig
-    cp ./temp_prefix/lib/pkgconfig/arrow-compute.pc $PREFIX/lib/pkgconfig
     cp ./temp_prefix/lib/pkgconfig/arrow-csv.pc $PREFIX/lib/pkgconfig
     cp ./temp_prefix/lib/pkgconfig/arrow-cuda.pc $PREFIX/lib/pkgconfig || true
     cp ./temp_prefix/lib/pkgconfig/arrow-filesystem.pc $PREFIX/lib/pkgconfig
@@ -36,6 +35,11 @@ elif [[ "${PKG_NAME}" == "libarrow-acero" ]]; then
     cp -a ./temp_prefix/lib/libarrow_acero.* $PREFIX/lib
     cp ./temp_prefix/lib/pkgconfig/arrow-acero.pc $PREFIX/lib/pkgconfig
     cp -R ./temp_prefix/lib/cmake/ArrowAcero/. $PREFIX/lib/cmake/ArrowAcero
+elif [[ "${PKG_NAME}" == "libarrow-compute" ]]; then
+    # only libarrow-compute
+    cp -a ./temp_prefix/lib/libarrow_compute.* $PREFIX/lib
+    cp ./temp_prefix/lib/pkgconfig/arrow-compute.pc $PREFIX/lib/pkgconfig
+    cp -R ./temp_prefix/lib/cmake/ArrowCompute/. $PREFIX/lib/cmake/ArrowCompute
 elif [[ "${PKG_NAME}" == "libarrow-dataset" ]]; then
     # only libarrow-dataset
     cp -a ./temp_prefix/lib/libarrow_dataset.* $PREFIX/lib

recipe/install-libarrow.sh

@@ -1,4 +1,4 @@
-{% set version = "20.0.0" %}
+{% set version = "21.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" %}
@@ -15,26 +15,24 @@ 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: 89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212
+    sha256: 5d3f8db7e72fb9f65f4785b7a1634522e8d8e9657a445af53d4a34a3849857b5
     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
-      # backport https://github.com/apache/arrow/pull/45859
-      - patches/0003-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch
 
   # testing-submodules not part of release tarball
   - git_url: https://github.com/apache/arrow-testing.git
-    git_rev: d2a13712303498963395318a4eb42872e66aead7
+    git_rev: fbf6b703dc93d17d75fa3664c5aa2c7873ebaf06
     folder: testing
   - git_url: https://github.com/apache/parquet-testing.git
     git_rev: 18d17540097fca7c40be3d42c167e6bfad90763c
     folder: cpp/submodules/parquet-testing
 
 build:
-  number: 18
+  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)]
@@ -52,7 +50,7 @@ requirements:
     - clangdev {{ llvm_version }}            # [build_platform != target_platform]
     - llvmdev {{ llvm_version }}             # [build_platform != target_platform]
     - gnuconfig                              # [build_platform != target_platform]
-    - cmake <4
+    - cmake
     - ninja
     # necessary for vendored jemalloc
     - autoconf     # [unix]
@@ -144,11 +142,12 @@ outputs:
         - {{ pin_subpackage("libparquet", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
         - {{ pin_subpackage("libarrow-dataset", exact=True) }}
         - {{ pin_subpackage("libarrow-flight", exact=True) }}
         - {{ pin_subpackage("libarrow-flight-sql", exact=True) }}
@@ -160,6 +159,7 @@ outputs:
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
         - {{ pin_subpackage("libarrow-dataset", exact=True) }}
         - {{ pin_subpackage("libarrow-flight", exact=True) }}
         - {{ pin_subpackage("libarrow-flight-sql", exact=True) }}
@@ -207,7 +207,7 @@ outputs:
         - '*/nvcuda.dll'      # [win]
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -232,10 +232,8 @@ outputs:
         - libgoogle-cloud-storage-devel
         - libopentelemetry-cpp              # [unix]
         - libprotobuf
-        - libutf8proc
         - lz4-c
         - orc
-        - re2
         - snappy
         - zlib
         - zstd
@@ -316,19 +314,21 @@ outputs:
         - {{ pin_subpackage("libarrow-acero", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
         - {{ compiler("c") }}
         - {{ compiler("cxx") }}
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
         - libabseil             # [osx]
         - libprotobuf           # [osx]
         - libopentelemetry-cpp  # [osx]
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
       # run-constraints handled by libarrow, since we depend on it with exact=True
 
     test:
@@ -354,6 +354,56 @@ outputs:
         - LICENSE.txt
       summary: C++ libraries for Apache Arrow Acero
 
+  - name: libarrow-compute
+    script: install-libarrow.sh  # [unix]
+    script: install-libarrow.bat  # [win]
+    version: {{ version }}
+    build:
+      string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
+      run_exports:
+        - {{ pin_subpackage("libarrow-compute", max_pin="x.x") }}
+    requirements:
+      build:
+        - cmake <4
+        - ninja
+        # for strong run-exports
+        - {{ stdlib("c") }}
+        - {{ compiler("c") }}
+        - {{ compiler("cxx") }}
+      host:
+        - {{ pin_subpackage("libarrow", exact=True) }}
+        - libabseil             # [osx]
+        - libopentelemetry-cpp  # [osx]
+        - libprotobuf           # [osx]
+        - libutf8proc
+        - re2
+      run:
+        - {{ pin_subpackage("libarrow", exact=True) }}
+      # run-constraints handled by libarrow, since we depend on it with exact=True
+
+    test:
+      commands:
+        # headers
+        - test -f $PREFIX/include/arrow/compute/api.h               # [unix]
+        - if not exist %LIBRARY_INC%\arrow\compute\api.h exit 1     # [win]
+
+        # shared libraries
+        - test -f $PREFIX/lib/libarrow_compute.so                   # [linux]
+        - test -f $PREFIX/lib/libarrow_compute.dylib                # [osx]
+        - if not exist %LIBRARY_BIN%\arrow_compute.dll exit 1       # [win]
+        - if not exist %LIBRARY_LIB%\arrow_compute.lib exit 1       # [win]
+
+        # absence of static libraries
+        - test ! -f $PREFIX/lib/libarrow_compute.a                  # [unix]
+        - if exist %LIBRARY_LIB%\arrow_compute_static.lib exit 1    # [win]
+
+    about:
+      home: http://github.com/apache/arrow
+      license: Apache-2.0
+      license_file:
+        - LICENSE.txt
+      summary: C++ libraries for Apache Arrow Compute
+
   - name: libarrow-dataset
     script: install-libarrow.sh  # [unix]
     script: install-libarrow.bat  # [win]
@@ -364,7 +414,7 @@ outputs:
         - {{ pin_subpackage("libarrow-dataset", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -373,13 +423,15 @@ outputs:
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
         - {{ pin_subpackage("libparquet", exact=True) }}
         - libabseil             # [osx]
         - libprotobuf           # [osx]
         - libopentelemetry-cpp  # [osx]
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
+        - {{ pin_subpackage("libarrow-compute", exact=True) }}
         - {{ pin_subpackage("libparquet", exact=True) }}
       # run-constraints handled by libarrow, since we depend on it with exact=True
 
@@ -416,7 +468,7 @@ outputs:
         - {{ pin_subpackage("libarrow-flight", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -468,7 +520,7 @@ outputs:
         - {{ pin_subpackage("libarrow-flight-sql", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -522,7 +574,7 @@ outputs:
         - {{ pin_subpackage("libarrow-gandiva", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -575,7 +627,7 @@ outputs:
         - {{ pin_subpackage("libarrow-substrait", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}
@@ -627,7 +679,7 @@ outputs:
         - {{ pin_subpackage("libparquet", max_pin="x.x") }}
     requirements:
       build:
-        - cmake <4
+        - cmake
         - ninja
         # for strong run-exports
         - {{ stdlib("c") }}

recipe/meta.yaml

@@ -1,7 +1,7 @@
-From 7eeeb3020a6598d5b3ee544517846eab878c4d98 Mon Sep 17 00:00:00 2001
+From 30fba4c46fe8073c9b2fead7e0a46a60a6d80324 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sat, 2 Nov 2024 15:41:34 +1100
-Subject: [PATCH 1/3] disable gcsfs_test
+Subject: [PATCH 1/2] 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
@@ -11,7 +11,7 @@ hard to fit this into our migration patterns
  1 file changed, 8 deletions(-)
 
 diff --git a/cpp/src/arrow/filesystem/CMakeLists.txt b/cpp/src/arrow/filesystem/CMakeLists.txt
-index 7afdf566f2..b22a48a0c9 100644
+index 5250ed2a88..ba053bd501 100644
 --- a/cpp/src/arrow/filesystem/CMakeLists.txt
 +++ b/cpp/src/arrow/filesystem/CMakeLists.txt
 @@ -42,14 +42,6 @@ if(ARROW_BUILD_BENCHMARKS)

recipe/patches/0001-disable-gcsfs_test.patch

@@ -1,17 +1,17 @@
-From deb8b771607671511ce0e2a2586502e0de3bc5c5 Mon Sep 17 00:00:00 2001
+From da2bd6baff0e10b961684a9024e25f9b2d821a3c Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sun, 24 Nov 2024 20:22:35 +1100
-Subject: [PATCH 2/3] skip NonExistentBucket test on osx
+Subject: [PATCH 2/2] 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 370f3b2685..45ed73d420 100644
+index f0a5d0e2e4..b5578b4f74 100644
 --- a/cpp/src/arrow/filesystem/s3fs_test.cc
 +++ b/cpp/src/arrow/filesystem/s3fs_test.cc
-@@ -431,6 +431,10 @@ TEST_F(S3RegionResolutionTest, RestrictedBucket) {
+@@ -438,6 +438,10 @@ TEST_F(S3RegionResolutionTest, RestrictedBucket) {
  }
 
  TEST_F(S3RegionResolutionTest, NonExistentBucket) {