Merge pull request #852 from h-vetinari/google_8.0

h-vetinari · web-flow · commit d501d2b699f1 · 2022-09-12T23:37:12.000+02:00
[8.0.x] Bump google-cloud-cpp
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -31,7 +31,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_64_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_arm64_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_arm64_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/osx_arm64_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_version10.2grpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.7.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.7.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.8.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.19python3.9.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compiler_versionNonegrpc_cpp1.47numpy1.21python3.10.____cpython.yaml
@@ -19,7 +19,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- '2.1'
+- '2.2'
 grpc_cpp:
 - '1.47'
 libabseil:
diff --git a/recipe/bld-arrow.bat b/recipe/bld-arrow.bat
@@ -15,13 +15,8 @@ if "%cuda_compiler_version%"=="None" (
 )
 
 cmake -G "Ninja" ^
-      -DBUILD_SHARED_LIBS=ON ^
-      -DCMAKE_CXX_STANDARD=17 ^
-      -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
       -DARROW_DEPENDENCY_SOURCE=SYSTEM ^
       -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^
-      -DLLVM_TOOLS_BINARY_DIR="%LIBRARY_BIN%" ^
-      -DPython3_EXECUTABLE="%PYTHON%" ^
       -DARROW_WITH_BZ2:BOOL=ON ^
       -DARROW_WITH_ZLIB:BOOL=ON ^
       -DARROW_WITH_ZSTD:BOOL=ON ^
@@ -32,8 +27,7 @@ cmake -G "Ninja" ^
       -DARROW_BUILD_TESTS:BOOL=OFF ^
       -DARROW_BUILD_UTILITIES:BOOL=OFF ^
       -DARROW_BUILD_STATIC:BOOL=OFF ^
-      -DCMAKE_BUILD_TYPE=release ^
-      -DARROW_SSE42:BOOL=OFF ^
+      -DARROW_SIMD_LEVEL:STRING=NONE ^
       -DARROW_PYTHON:BOOL=ON ^
       -DARROW_MIMALLOC:BOOL=ON ^
       -DARROW_DATASET:BOOL=ON ^
@@ -43,10 +37,16 @@ cmake -G "Ninja" ^
       -DARROW_GCS:BOOL=ON ^
       -DARROW_PARQUET:BOOL=ON ^
       -DARROW_GANDIVA:BOOL=ON ^
-      -DARROW_ORC:BOOL=ON ^
+      -DARROW_ORC:BOOL=OFF ^
       -DARROW_S3:BOOL=ON ^
-      -DBoost_NO_BOOST_CMAKE=ON ^
+      -DBUILD_SHARED_LIBS=ON ^
+      -DCMAKE_BUILD_TYPE=release ^
+      -DCMAKE_CXX_STANDARD=17 ^
+      -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
       -DCMAKE_UNITY_BUILD=ON ^
+      -DBoost_NO_BOOST_CMAKE=ON ^
+      -DLLVM_TOOLS_BINARY_DIR="%LIBRARY_BIN%" ^
+      -DPython3_EXECUTABLE="%PYTHON%" ^
       %EXTRA_CMAKE_ARGS% ^
       ..
 if errorlevel 1 exit 1
diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh
@@ -48,13 +48,12 @@ if [[ "${target_platform}" == "linux-aarch64" ]] || [[ "${target_platform}" == "
      export CMAKE_BUILD_PARALLEL_LEVEL=3
 fi
 
-cmake \
+cmake -GNinja \
     -DARROW_BOOST_USE_SHARED=ON \
     -DARROW_BUILD_BENCHMARKS=OFF \
     -DARROW_BUILD_STATIC=OFF \
     -DARROW_BUILD_TESTS=OFF \
     -DARROW_BUILD_UTILITIES=OFF \
-    -DBUILD_SHARED_LIBS=ON \
     -DARROW_DATASET=ON \
     -DARROW_SUBSTRAIT=ON \
     -DARROW_DEPENDENCY_SOURCE=SYSTEM \
@@ -79,14 +78,14 @@ cmake \
     -DARROW_WITH_SNAPPY=ON \
     -DARROW_WITH_ZLIB=ON \
     -DARROW_WITH_ZSTD=ON \
+    -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_CXX_STANDARD=17 \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DLLVM_TOOLS_BINARY_DIR=$PREFIX/bin \
     -DPython3_EXECUTABLE=${PYTHON} \
     -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc \
-    -GNinja \
     ${EXTRA_CMAKE_ARGS} \
     ..
 
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -9,3 +9,7 @@ c_compiler_version:    # [ppc64le]
 - '7'                  # [ppc64le]
 cxx_compiler_version:  # [ppc64le]
 - '7'                  # [ppc64le]
+
+# no migrator yet, but arrow is the only consumer anyway
+google_cloud_cpp:
+  - "2.2"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
