Merge pull request #365 from regro-cf-autotick-bot/1.63.0_h323352

grpc-cpp v1.63.1
conda-forge · Jul 17, 2024 · 6a6a695 · 6a6a695
2 parents 6c30624 + 95891ea
commit 6a6a695
Show file tree

Hide file tree

Showing 28 changed files with 229 additions and 185 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,3 +1,5 @@
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -7,9 +9,9 @@ c_compiler_version:
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -23,7 +25,7 @@ docker_image:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 openssl:
 - '3'
 pin_run_as_build:
@@ -56,4 +58,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -1,5 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -27,7 +29,7 @@ docker_image:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 openssl:
 - '3'
 pin_run_as_build:
@@ -60,4 +62,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -1,3 +1,5 @@
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -23,7 +25,7 @@ docker_image:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 openssl:
 - '3'
 pin_run_as_build:
@@ -56,4 +58,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml
diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml
diff --git a/.ci_support/migrations/libgrpc163_libprotobuf5261.yaml b/.ci_support/migrations/libgrpc163_libprotobuf5261.yaml
@@ -0,0 +1,11 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libgrp 1.63 & libprotobuf 5.26.1
+  kind: version
+  paused: true
+  migration_number: 2
+libgrpc:
+- "1.63"
+libprotobuf:
+- 5.26.1
+migrator_ts: 1711628174.9404116
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -21,7 +25,7 @@ cxx_compiler_version:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:
@@ -54,4 +58,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,5 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -21,7 +25,7 @@ cxx_compiler_version:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:
@@ -52,4 +56,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,3 +1,5 @@
+bootstrap:
+- 'yes'
 c_ares:
 - '1'
 c_compiler:
@@ -13,7 +15,7 @@ cxx_compiler:
 libabseil:
 - '20240116'
 libprotobuf:
-- 4.25.3
+- 5.26.1
 openssl:
 - '3'
 pin_run_as_build:
@@ -42,4 +44,4 @@ zip_keys:
 - - python
   - python_impl
 zlib:
-- '1.2'
+- '1'
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,3 @@
+# if bootstrapping, don't build grpcio to break cycle; see meta.yaml
+bootstrap:
+  - yes
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.62.2" %}
+{% set version = "1.63.1" %}
 
 # core package & vendored libs use different version scheme than CPP libs, see
 # https://github.com/grpc/grpc/blob/v1.48.1/CMakeLists.txt#L28-L32
@@ -13,13 +13,17 @@
     "cpp", "csharp", "node", "objective_c", "php", "python", "ruby"
 ] %}
 
+{% if bootstrap is undefined %}
+{% set bootstrap = "no" %}
+{% endif %}
+
 package:
   name: grpc-split
   version: {{ version }}
 
 source:
   url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
-  sha256: e5d5e0dd96fe9452fe24cc8c827381dca484c54d171fb512a198025fec81a3c8
+  sha256: 31198ecf6ec8a79b0c42a90441ddce858e5fae690c2e300d5d08a9f45d7136df
   patches:
     - patches/0001-windows-ssl-lib-names.patch
     - patches/0002-fix-win-setup-cmds.patch
@@ -36,6 +40,8 @@ source:
     - patches/0009-fix-missing-DLL-exports-in-vendored-upb.patch
     # fix symbol visibility regression on windows
     - patches/0010-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
+    # work-around for https://github.com/grpc/grpc/issues/36654
+    - patches/0011-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch
 
 build:
   number: 0
@@ -47,13 +53,10 @@ outputs:
     build:
       run_exports:
         - {{ pin_subpackage('libgrpc', max_pin='x.x') }}
-        # grpc requires C11 aligned_alloc as of 1.56;
-        # ensure that all dependent packages reflect that to
-        # avoid the solver getting stuck in no-man's-land.
-        - __osx >={{ MACOSX_DEPLOYMENT_TARGET }}  # [osx and x86_64]
     requirements:
       build:
         - {{ compiler('c') }}
+        - {{ stdlib("c") }}
         - {{ compiler('cxx') }}
         - cmake
         - ninja
@@ -75,7 +78,6 @@ outputs:
         - zlib
       run:
         - ucrt  # [win]
-        - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]
       run_constrained:
         # make sure we don't co-install with old version of previous package name
         - grpc-cpp ={{ version }}
@@ -134,28 +136,31 @@ outputs:
         - cmake -GNinja -DCMAKE_CXX_STANDARD=17 %CMAKE_ARGS% .  # [win]
         - cmake --build .
 
+  {% if bootstrap == "no" %}
+  # to properly test, we need protobuf; but protobuf nowadays needs bazel
+  # and bazel needs libgrpc. Disable grpcio builds to bootstrap.
   - name: grpcio
     script: build-grpcio.sh  # [not win]
     script: build-grpcio.bat  # [win]
     requirements:
       build:
         - python                                 # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-        - cython <3                              # [build_platform != target_platform]
+        - cython                                 # [build_platform != target_platform]
         - {{ compiler('c') }}
+        - {{ stdlib("c") }}
         - {{ compiler('cxx') }}
       host:
         - python
         - pip
         - setuptools
-        - cython <3
+        - cython
         - {{ pin_subpackage('libgrpc', exact=True) }}
         - pthread-stubs                               # [linux]
         - zlib
       run:
         - python
         - {{ pin_subpackage('libgrpc', exact=True) }}
-        - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]
     test:
       source_files:
         - examples/
@@ -188,6 +193,7 @@ outputs:
         - cp ../../../test_grpcio_helloworld.py .
         - python test_grpcio_helloworld.py
         {% endif %}
+  {% endif %}
 
 about:
   home: https://grpc.io/