Merge pull request #382 from xhochy/1.67.0

grpc-cpp 1.67.0
conda-forge · Oct 18, 2024 · c7fcb57 · c7fcb57
2 parents d05d293 + ed8d990
commit c7fcb57
Show file tree

Hide file tree

Showing 25 changed files with 174 additions and 120 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
@@ -23,7 +23,7 @@ docker_image:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 openssl:
 - '3'
 pin_run_as_build:
@@ -34,12 +34,8 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
@@ -49,7 +45,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
-- - python
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -27,7 +27,7 @@ docker_image:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 openssl:
 - '3'
 pin_run_as_build:
@@ -38,12 +38,8 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
@@ -53,7 +49,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
-- - python
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -23,7 +23,7 @@ docker_image:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 openssl:
 - '3'
 pin_run_as_build:
@@ -34,12 +34,8 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
@@ -49,7 +45,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
-- - python
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml
@@ -0,0 +1,11 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2
+  kind: version
+  migration_number: 1
+  use_local: true
+libgrpc:
+- "1.67"
+libprotobuf:
+- 5.28.2
+migrator_ts: 1729238463
diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml
@@ -0,0 +1,46 @@
+migrator_ts: 1724712607
+__migrator:
+    commit_message: Rebuild for python 3.13
+    migration_number: 1
+    operation: key_add
+    primary_key: python
+    ordering:
+        python:
+            - 3.6.* *_cpython
+            - 3.7.* *_cpython
+            - 3.8.* *_cpython
+            - 3.9.* *_cpython
+            - 3.10.* *_cpython
+            - 3.11.* *_cpython
+            - 3.12.* *_cpython
+            - 3.13.* *_cp313  # new entry
+            - 3.6.* *_73_pypy
+            - 3.7.* *_73_pypy
+            - 3.8.* *_73_pypy
+            - 3.9.* *_73_pypy
+    paused: false
+    longterm: true
+    pr_limit: 20
+    max_solver_attempts: 3  # this will make the bot retry "not solvable" stuff 12 times
+    exclude:
+        # this shouldn't attempt to modify the python feedstocks
+        - python
+        - pypy3.6
+        - pypy-meta
+        - cross-python
+        - python_abi
+        # see https://github.com/conda-forge/scipy-feedstock/pull/283
+        - scipy
+    exclude_pinned_pkgs: false
+    additional_zip_keys:
+        - channel_sources
+
+python:
+- 3.13.* *_cp313
+channel_sources:
+- conda-forge/label/python_rc,conda-forge
+# additional entries to add for zip_keys
+numpy:
+- 2
+python_impl:
+- cpython
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -23,7 +23,7 @@ cxx_compiler_version:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:
@@ -36,20 +36,14 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
 - osx-64
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - python
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -23,7 +23,7 @@ cxx_compiler_version:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:
@@ -36,20 +36,14 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
 - osx-arm64
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - python
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 libabseil:
 - '20240722'
 libprotobuf:
-- 5.27.5
+- 5.28.2
 openssl:
 - '3'
 pin_run_as_build:
@@ -24,18 +24,11 @@ python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
 - 3.12.* *_cpython
+- 3.13.* *_cp313
 - 3.9.* *_cpython
-python_impl:
-- cpython
-- cpython
-- cpython
-- cpython
 re2:
 - 2023.09.01
 target_platform:
 - win-64
-zip_keys:
-- - python
-  - python_impl
 zlib:
 - '1'
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/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.65.5" %}
+{% set version = "1.67.0" %}
 
 # 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
@@ -19,7 +19,7 @@ package:
 
 source:
   - url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
-    sha256: bdab9cb52e3ee703d6c09d15716bcc10a150b2e9e414182e5b375d32050dba84
+    sha256: af0638f73e4452e22e295f8b3f452518234254104713a08497f3d3aaa76733ad
     patches:
       - patches/0001-windows-ssl-lib-names.patch
       - patches/0002-fix-win-setup-cmds.patch
@@ -39,7 +39,7 @@ source:
       - patches/0010-set-Wl-undefined-dynamic_lookup-for-upb_-json-textfo.patch
       - patches/0011-add-missing-GRPC_DLL-macro.patch
   - url: https://pypi.io/packages/source/g/grpcio-tools/grpcio_tools-{{ version }}.tar.gz
-    sha256: 7c3a47ad0070bc907c7818caf55aa1948e9282d24e27afd21015872a25594bc7
+    sha256: 181b3d4e61b83142c182ec366f3079b0023509743986e54c9465ca38cac255f8
     folder: grpcio_tools
 
 build:
@@ -199,24 +199,33 @@ outputs:
     build:
       script:
         - cd grpcio_tools
+        - export GRPC_PYTHON_BUILD_WITH_CYTHON=true  # [unix]
+        - set GRPC_PYTHON_BUILD_WITH_CYTHON=true     # [win]
         - python -m pip install . -vv
     requirements:
       build:
         - python                                 # [build_platform != target_platform]
+        - cython                                 # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
         - {{ stdlib('c') }}
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
       host:
         - grpcio ={{ version }}=*_{{ PKG_BUILDNUM }}
         - python
+        - cython
         - pip
         - setuptools
       run:
         - grpcio ={{ version }}=*_{{ PKG_BUILDNUM }}
         - python
         - protobuf
+        - setuptools
     test:
+      requires:
+        - pip
+      commands:
+        - pip check
       imports:
         - grpc_tools