Update to Arrow v16.0.0

conda-forge.yml

@@ -3,6 +3,7 @@ azure:
   max_parallel: 20
 bot:
   abi_migration_branches:
+  - 15.x
   - 14.x
   - 13.x
   - 12.x

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "15.0.2" %}
+{% set version = "16.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,23 +15,19 @@ 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: abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6
+    sha256: 9f4051ae9473c97991d9af801e2f94ae3455067719ca7f90b8137f9e9a700b8d
     patches:
       # workaround for https://github.com/apache/arrow/issues/37692
       - patches/0001-fixture-teardown-should-not-fail-test.patch
-      # backport https://github.com/apache/arrow/pull/40150 to unpin setuptools-scm
-      - patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch
-      # backport https://github.com/apache/arrow/pull/40230 for glog 0.7 compat
-      - patches/0003-GH-40181-C-Support-glog-0.7-build-40230.patch
-      # backport https://github.com/apache/arrow/pull/40412 to plug a python memory leak
-      - patches/0004-GH-37989-Plug-reference-leaks.patch
+      # backport https://github.com/apache/arrow/issues/41333 to find correct protobuf
+      - patches/0002-find-protobuf-config-instead-of-module.patch
   # testing-submodule not part of release tarball
   - git_url: https://github.com/apache/arrow-testing.git
-    git_rev: ad82a736c170e97b7c8c035ebd8a801c17eec170
+    git_rev: 25d16511e8d42c2744a1d94d90169e3a36e92631
     folder: testing
 
 build:
-  number: 5
+  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)]

recipe/patches/0002-find-protobuf-config-instead-of-module.patch

@@ -0,0 +1,40 @@
+diff --git a/cpp/cmake_modules/FindProtobufAlt.cmake b/cpp/cmake_modules/FindProtobufAlt.cmake
+index 15fe1b4..503cffe 100644
+--- a/cpp/cmake_modules/FindProtobufAlt.cmake
++++ b/cpp/cmake_modules/FindProtobufAlt.cmake
+@@ -28,12 +28,27 @@ endif()
+ if(ProtobufAlt_FIND_QUIETLY)
+   list(APPEND find_package_args QUIET)
+ endif()
+-find_package(Protobuf ${find_package_args})
+-set(ProtobufAlt_FOUND ${Protobuf_FOUND})
++find_package(protobuf CONFIG ${find_package_args})
++set(ProtobufAlt_FOUND ${protobuf_FOUND})
+ if(ProtobufAlt_FOUND)
+-  set(ProtobufAlt_VERSION ${Protobuf_VERSION})
+-  set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
+-  set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})
+-  set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH})
+-  set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK})
++  if(Protobuf_PROTOC_EXECUTABLE)
++    set_target_properties(protobuf::protoc PROPERTIES
++    IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}"
++  )
++  endif()
++  set(ProtobufAlt_VERSION ${protobuf_VERSION})
++  set(ProtobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR})
++  set(ProtobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR})
++  set(ProtobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH})
++  set(ProtobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK})
++else()
++  find_package(Protobuf ${find_package_args})
++  set(ProtobufAlt_FOUND ${Protobuf_FOUND})
++  if(ProtobufAlt_FOUND)
++    set(ProtobufAlt_VERSION ${Protobuf_VERSION})
++    set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
++    set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})
++    set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH})
++    set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK})
++  endif()
+ endif()
+