Merge pull request #1371 from regro-cf-autotick-bot/rebuild-libgoogle…

…_cloud223-0-1_hed36e8 [14.x] Rebuild for libgoogle_cloud 2.23
conda-forge · Apr 23, 2024 · 86b1c3a · 86b1c3a
2 parents 239eb98 + 7db9cc2
commit 86b1c3a
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 59 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...ompiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10.yaml b/...ompiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -37,9 +37,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/...ompiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/...ompiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -37,9 +37,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml b/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml
@@ -41,9 +41,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version13.yaml b/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version13.yaml
@@ -9,7 +9,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -31,7 +31,7 @@ cuda_compiler_version_min:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 gflags:
@@ -41,9 +41,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml b/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml
@@ -37,9 +37,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml b/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml
@@ -37,9 +37,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/.ci_support/migrations/aws_crt_cpp0266.yaml b/.ci_support/migrations/aws_crt_cpp0266.yaml
diff --git a/.ci_support/migrations/libgoogle_cloud223.yaml b/.ci_support/migrations/libgoogle_cloud223.yaml
@@ -0,0 +1,46 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libgoogle_cloud 2.23
+  kind: version
+  migration_number: 1
+google_cloud_cpp:
+  - '2.23'
+libgoogle_cloud:
+  - '2.23'
+libgoogle_cloud_devel:
+  - '2.23'
+libgoogle_cloud_all_devel:
+  - '2.23'
+libgoogle_cloud_aiplatform_devel:
+  - '2.23'
+libgoogle_cloud_automl_devel:
+  - '2.23'
+libgoogle_cloud_bigquery_devel:
+  - '2.23'
+libgoogle_cloud_bigtable_devel:
+  - '2.23'
+libgoogle_cloud_compute_devel:
+  - '2.23'
+libgoogle_cloud_dialogflow_cx_devel:
+  - '2.23'
+libgoogle_cloud_dialogflow_es_devel:
+  - '2.23'
+libgoogle_cloud_discoveryengine_devel:
+  - '2.23'
+libgoogle_cloud_dlp_devel:
+  - '2.23'
+libgoogle_cloud_iam_devel:
+  - '2.23'
+libgoogle_cloud_oauth2_devel:
+  - '2.23'
+libgoogle_cloud_policytroubleshooter_devel:
+  - '2.23'
+libgoogle_cloud_pubsub_devel:
+  - '2.23'
+libgoogle_cloud_spanner_devel:
+  - '2.23'
+libgoogle_cloud_speech_devel:
+  - '2.23'
+libgoogle_cloud_storage_devel:
+  - '2.23'
+migrator_ts: 1713301249.438007
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -31,9 +31,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -31,9 +31,9 @@ glog:
 libabseil:
 - '20240116'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml
@@ -8,8 +8,6 @@ c_compiler:
 - vs2019
 c_stdlib:
 - vs
-c_stdlib_version:
-- '2019'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,9 +31,9 @@ libcrc32c:
 libcurl:
 - '8'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml
@@ -8,8 +8,6 @@ c_compiler:
 - vs2019
 c_stdlib:
 - vs
-c_stdlib_version:
-- '2019'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,9 +31,9 @@ libcrc32c:
 libcurl:
 - '8'
 libgoogle_cloud_devel:
-- '2.22'
+- '2.23'
 libgoogle_cloud_storage_devel:
-- '2.22'
+- '2.23'
 libgrpc:
 - '1.62'
 libprotobuf:

diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,6 +1,13 @@
-# keep this in sync with llvm_version in meta.yaml;
-# don't rely on global pinning even if it matches
-c_compiler_version:            # [osx]
+# on osx, keep this in sync with llvm_version in meta.yaml.
+# linux-aarch hits a compiler bug with GCC 12, upgrade; needs override
+# for three versions on linux: one for non-CUDA & two for 11.2 & 11.8
+c_compiler_version:            # [unix]
   - 15                         # [osx]
-cxx_compiler_version:          # [osx]
+  - 13                         # [linux and aarch64]
+  - 10                         # [linux and aarch64]
+  - 11                         # [linux and aarch64]
+cxx_compiler_version:          # [unix]
   - 15                         # [osx]
+  - 13                         # [linux and aarch64]
+  - 10                         # [linux and aarch64]
+  - 11                         # [linux and aarch64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -32,7 +32,7 @@ source:
     folder: testing
 
 build:
-  number: 16
+  number: 17
   # 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)]
@@ -168,8 +168,8 @@ outputs:
         - {{ pin_subpackage("libarrow", max_pin="x") }}
       ignore_run_exports_from:
         - {{ compiler("cuda") }}                 # [cuda_compiler_version != "None"]
-        # arrow only uses headers, apparently
-        - gflags
+        # arrow only uses headers on osx/win, apparently
+        - gflags                                 # [not linux]
         # shared lib linked on unix, not on win
         - glog                                   # [win]
       ignore_run_exports:
@@ -296,6 +296,7 @@ outputs:
         - {{ compiler("cxx") }}
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
+        - gflags    # [linux]
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
       # run-constraints handled by libarrow, since we depend on it with exact=True
@@ -343,6 +344,7 @@ outputs:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
         - {{ pin_subpackage("libparquet", exact=True) }}
+        - gflags    # [linux]
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
@@ -393,6 +395,7 @@ outputs:
         - libprotobuf                            # [build_platform != target_platform]
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
+        - gflags       # [linux]
         - libabseil
         - libgrpc
         - libprotobuf
@@ -449,6 +452,7 @@ outputs:
       host:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-flight", exact=True) }}
+        - gflags        # [linux]
         - libprotobuf
       run:
         - {{ pin_subpackage("libarrow", exact=True) }}
@@ -496,7 +500,7 @@ outputs:
         - {{ compiler("cxx") }}
       host:
         - {{ pin_subpackage("libarrow", max_pin="x") }}
-        - libabseil
+        - gflags                   # [linux]
         - libutf8proc
         # gandiva requires shared libllvm; needs to match version used at build time
         - llvm {{ llvm_version }}  # [unix]
@@ -557,6 +561,7 @@ outputs:
         - {{ pin_subpackage("libarrow", exact=True) }}
         - {{ pin_subpackage("libarrow-acero", exact=True) }}
         - {{ pin_subpackage("libarrow-dataset", exact=True) }}
+        - gflags     # [linux]
         - libabseil  # [win]
         - libprotobuf
       run:
@@ -606,6 +611,7 @@ outputs:
         - {{ compiler("cxx") }}
       host:
         - {{ pin_subpackage("libarrow", max_pin="x") }}
+        - gflags        # [linux]
         - openssl
         - thrift-cpp
       run:
@@ -668,6 +674,7 @@ outputs:
         - {{ pin_subpackage("libarrow-all", exact=True) }}
         - clangdev {{ llvm_version }}
         - llvmdev {{ llvm_version }}
+        - zlib
         - cython
         - numpy
         - python
@@ -761,6 +768,7 @@ outputs:
         - {{ pin_subpackage('pyarrow', exact=True) }}
         - clangdev {{ llvm_version }}
         - llvmdev {{ llvm_version }}
+        - zlib
         - cython
         - numpy
         - python