Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- linux-64
zip_keys:
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- linux-aarch64
zip_keys:
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
46 changes: 0 additions & 46 deletions .ci_support/migrations/python313.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- osx-64
zip_keys:
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- osx-arm64
zip_keys:
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ python:
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
re2:
- 2024.07.02
- 2025.08.12
target_platform:
- win-64
zlib:
Expand Down
5 changes: 3 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.74.1" %}
{% set version = "1.75.0" %}

# core package & vendored libs use different version scheme than CPP libs, see
# top of https://github.com/grpc/grpc/blob/v{{ version }}/CMakeLists.txt
Expand All @@ -19,7 +19,7 @@ package:

source:
- url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
sha256: 7bf97c11cf3808d650a3a025bbf9c5f922c844a590826285067765dfd055d228
sha256: 31d6c01c3bfa0a3584532665715e487703eb10d76bb30b4875e57d139c13bbf9
patches:
- patches/0001-windows-ssl-lib-names.patch
- patches/0002-fix-win-setup-cmds.patch
Expand Down Expand Up @@ -193,6 +193,7 @@ outputs:
run:
- python
- {{ pin_subpackage('libgrpc', exact=True) }}
- typing-extensions >=4.12,<5
test:
source_files:
- examples/python/helloworld/
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0001-windows-ssl-lib-names.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e59f750d772dc50b105b7cb72cb07049dabc06d4 Mon Sep 17 00:00:00 2001
From d31df2e44c72e00b4eed156e9b56838c2ce4d409 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <[email protected]>
Date: Mon, 17 Feb 2020 15:45:06 -0600
Subject: [PATCH 01/14] windows ssl lib names
Expand All @@ -11,10 +11,10 @@ Co-Authored-By: Marius van Niekerk <[email protected]>
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 39ca17e824..3a879f037b 100644
index 503cc2b4fa..152645b1df 100644
--- a/setup.py
+++ b/setup.py
@@ -367,10 +367,10 @@ if "win32" in sys.platform:
@@ -369,10 +369,10 @@ if "win32" in sys.platform:
"ws2_32",
)
if BUILD_WITH_SYSTEM_OPENSSL:
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0002-fix-win-setup-cmds.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 55e49713af0b46a795eba6d1c31f3f2caa4004e7 Mon Sep 17 00:00:00 2001
From f10a11f6412dfa21e547dc72d9e01f8bba5cabb3 Mon Sep 17 00:00:00 2001
From: Mike Sarahan <[email protected]>
Date: Tue, 18 Feb 2020 13:53:05 -0600
Subject: [PATCH 02/14] fix win setup cmds
Expand All @@ -12,10 +12,10 @@ Co-Authored-By: H. Vetinari <[email protected]>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 3a879f037b..adfec063fd 100644
index 152645b1df..a73cc24346 100644
--- a/setup.py
+++ b/setup.py
@@ -209,6 +209,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
@@ -211,6 +211,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(


def check_linker_need_libatomic():
Expand All @@ -25,7 +25,7 @@ index 3a879f037b..adfec063fd 100644
"""Test if linker on system needs libatomic."""
code_test = (
b"#include <atomic>\n"
@@ -266,9 +269,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
@@ -268,9 +271,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
# MSVC by defaults uses C++14 and C89 so both needs to be configured.
EXTRA_ENV_COMPILE_ARGS += " /std:c++17"
EXTRA_ENV_COMPILE_ARGS += " /std:c11"
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0003-Link-against-grpc-and-abseil.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 03a57b7b1d8ce206503d8670d0865e47b8ade4fb Mon Sep 17 00:00:00 2001
From 906c60346084305e436287fb06da86c6debd0216 Mon Sep 17 00:00:00 2001
From: Marius van Niekerk <[email protected]>
Date: Mon, 13 Jun 2022 17:13:07 -0400
Subject: [PATCH 03/14] Link against grpc and abseil
Expand All @@ -9,10 +9,10 @@ Co-Authored-By: H. Vetinari <[email protected]>
1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index adfec063fd..266a690474 100644
index a73cc24346..824d8aa016 100644
--- a/setup.py
+++ b/setup.py
@@ -180,6 +180,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
@@ -182,6 +182,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
"GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
)

Expand All @@ -21,7 +21,7 @@ index adfec063fd..266a690474 100644
# For local development use only: This skips building gRPC Core and its
# dependencies, including protobuf and boringssl. This allows "incremental"
# compilation by first building gRPC Core using make, then building only the
@@ -378,10 +380,20 @@ if BUILD_WITH_SYSTEM_CARES:
@@ -380,10 +382,20 @@ if BUILD_WITH_SYSTEM_CARES:
if BUILD_WITH_SYSTEM_RE2:
EXTENSION_LIBRARIES += ("re2",)
if BUILD_WITH_SYSTEM_ABSL:
Expand All @@ -46,7 +46,7 @@ index adfec063fd..266a690474 100644

DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
asm_files = []
@@ -493,6 +505,9 @@ def cython_extensions_and_necessity():
@@ -495,6 +507,9 @@ def cython_extensions_and_necessity():
prefix + "libgrpc.a",
]
core_c_files = []
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0004-force-protoc-executable.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e8d9bf8d039be5566356767abede27369aeebc6b Mon Sep 17 00:00:00 2001
From 1e09c50f603babd53c47fe68c55ded23744cf4e0 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 11 Sep 2020 14:20:04 +0200
Subject: [PATCH 04/14] force protoc executable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 125988603f3967381fc3e7d71673decd1ae46601 Mon Sep 17 00:00:00 2001
From 19f402ca8c02c116a3865fd376f2b4d90b96bfeb Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Tue, 23 Aug 2022 11:45:20 +0200
Subject: [PATCH 05/14] mark linkages of grpc{,_unsecure} as private
Expand All @@ -13,10 +13,10 @@ Co-Authored-By: Mark Harfouche <[email protected]>
1 file changed, 60 insertions(+), 50 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ded1f310f1..87cb862d5b 100644
index 67f7511a4e..45badf99e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3069,35 +3069,40 @@ target_include_directories(grpc
@@ -3097,35 +3097,40 @@ target_include_directories(grpc
${_gRPC_ZLIB_INCLUDE_DIR}
)
target_link_libraries(grpc
Expand Down Expand Up @@ -84,7 +84,7 @@ index ded1f310f1..87cb862d5b 100644
endif()

foreach(_hdr
@@ -3791,32 +3796,37 @@ target_include_directories(grpc_unsecure
@@ -3824,32 +3829,37 @@ target_include_directories(grpc_unsecure
${_gRPC_ZLIB_INCLUDE_DIR}
)
target_link_libraries(grpc_unsecure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9f78d07830de049a63a049d76396b4c683c34c1b Mon Sep 17 00:00:00 2001
From fd5fcee8d84cf4b1a2370ce6230eb3bf77487925 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Thu, 29 Feb 2024 20:31:21 +1100
Subject: [PATCH 06/14] for main targets, set *_DLL_EXPORTS when building and
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH 06/14] for main targets, set *_DLL_EXPORTS when building and
1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87cb862d5b..62d5c071ef 100644
index 45badf99e6..73e4150f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2063,10 +2063,8 @@ if(WIN32 AND MSVC)
@@ -2080,10 +2080,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -25,7 +25,7 @@ index 87cb862d5b..62d5c071ef 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb
@@ -3042,11 +3040,8 @@ if(WIN32 AND MSVC)
@@ -3070,11 +3068,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -39,7 +39,7 @@ index 87cb862d5b..62d5c071ef 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
@@ -3769,11 +3764,8 @@ if(WIN32 AND MSVC)
@@ -3802,11 +3797,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -53,7 +53,7 @@ index 87cb862d5b..62d5c071ef 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb
@@ -4791,12 +4783,8 @@ if(WIN32 AND MSVC)
@@ -4824,12 +4816,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand All @@ -68,7 +68,7 @@ index 87cb862d5b..62d5c071ef 100644
endif()
if(gRPC_INSTALL)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb
@@ -5531,12 +5519,8 @@ if(WIN32 AND MSVC)
@@ -5568,12 +5556,8 @@ if(WIN32 AND MSVC)
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
)
if(BUILD_SHARED_LIBS)
Expand Down
Loading
Loading