SLFO-pool/python-grpcio
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: SLFO-pool:main
Branches Tags
SLFO-pool:main SLFO-pool:1.1
..
compare: SLFO-pool:1.1
Branches Tags
SLFO-pool:main SLFO-pool:1.1

1 Commits
main ... 1.1

Author SHA256 Message Date
Adrian Schröter
f48ea087aa Sync from SUSE:SLFO:1.1 python-grpcio revision 7e72968d5cf0b3ca292ebac580ee839e 2025-04-16 01:04:10 +02:00
8 changed files with 90 additions and 169 deletions
Expand all files Collapse all files

64
fix-return-values.patch
View File

@@ -1,64 +0,0 @@
Index: grpcio-1.68.1/src/core/lib/promise/party.h
===================================================================
--- grpcio-1.68.1.orig/src/core/lib/promise/party.h
+++ grpcio-1.68.1/src/core/lib/promise/party.h
@@ -269,6 +269,7 @@ class Party : public Activity, private W
Crash(
"unreachable: promises should not be repolled after completion");
}
+ return false;
}
// Outside party poll: check whether the spawning party has completed this
@@ -281,6 +282,7 @@ class Party : public Activity, private W
case State::kResult:
return std::move(result_);
}
+ return Pending{};
}
void Destroy() override { this->Unref(); }
Index: grpcio-1.68.1/src/core/lib/transport/call_state.h
===================================================================
--- grpcio-1.68.1.orig/src/core/lib/transport/call_state.h
+++ grpcio-1.68.1/src/core/lib/transport/call_state.h
@@ -151,6 +151,7 @@ class CallState {
case ClientToServerPullState::kTerminated:
return "Terminated";
}
+ return "";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ClientToServerPullState state) {
@@ -181,6 +182,7 @@ class CallState {
case ClientToServerPushState::kFinished:
return "Finished";
}
+ return "";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ClientToServerPushState state) {
@@ -231,6 +233,7 @@ class CallState {
case ServerToClientPullState::kTerminated:
return "Terminated";
}
+ return "";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerToClientPullState state) {
@@ -268,6 +271,7 @@ class CallState {
case ServerToClientPushState::kFinished:
return "Finished";
}
+ return "";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerToClientPushState state) {
@@ -298,6 +302,7 @@ class CallState {
case ServerTrailingMetadataState::kPulledCancel:
return "PulledCancel";
}
+ return "";
}
template <typename Sink>
friend void AbslStringify(Sink& out, ServerTrailingMetadataState state) {

BIN
grpcio-1.60.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
grpcio-1.69.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

63
python-grpcio-cython3-compat.patch Normal file
View File

@@ -0,0 +1,63 @@
Index: grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
===================================================================
--- grpcio-1.60.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
+++ grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
@@ -13,16 +13,16 @@
# limitations under the License.
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
-cdef void* _copy_pointer(void* pointer):
+cdef void* _copy_pointer(void* pointer) noexcept:
return pointer
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
-cdef void _destroy_pointer(void* pointer):
+cdef void _destroy_pointer(void* pointer) noexcept:
pass
-cdef int _compare_pointer(void* first_pointer, void* second_pointer):
+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept:
if first_pointer < second_pointer:
return -1
elif first_pointer > second_pointer:
Index: grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
===================================================================
--- grpcio-1.60.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
+++ grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
@@ -316,7 +316,7 @@ def server_credentials_ssl_dynamic_cert_
return credentials
cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper(
- void* user_data, grpc_ssl_server_certificate_config **config) with gil:
+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil:
# This is a credentials.ServerCertificateConfig
cdef ServerCertificateConfig cert_config = None
if not user_data:
Index: grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
===================================================================
--- grpcio-1.60.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
+++ grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
@@ -50,7 +50,7 @@ cdef class CallbackWrapper:
@staticmethod
cdef void functor_run(
grpc_completion_queue_functor* functor,
- int success):
+ int success) noexcept:
cdef CallbackContext *context = <CallbackContext *>functor
cdef object waiter = <object>context.waiter
if not waiter.cancelled():
Index: grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
===================================================================
--- grpcio-1.60.0.orig/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
+++ grpcio-1.60.0/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
@@ -48,7 +48,7 @@ cdef class CallbackWrapper:
@staticmethod
cdef void functor_run(
grpc_completion_queue_functor* functor,
- int succeed)
+ int succeed) noexcept
cdef grpc_completion_queue_functor *c_functor(self)

98
python-grpcio.changes
View File

@@ -1,89 +1,3 @@
-------------------------------------------------------------------
Mon Jan 20 14:23:28 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 1.69.0
* [Build] Override MACOSX_DEPLOYMENT_TARGET for gRPC Python. (#37997)
- from version 1.68.2
* No Python-specific changes.
-------------------------------------------------------------------
Wed Dec 18 11:13:30 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.68.1 (CVE-2024-11407, bsc#1233821):
* No Python specific changes.
- Changes from version 1.68.0:
* Add templating and support for Python 3.13
(gh#grpc/grpc#37643).
-------------------------------------------------------------------
Mon Nov 11 14:35:18 UTC 2024 - Adrian Schröter <adrian@suse.de>
- Update to version 1.67.1 (CVE-2024-7246, bsc#1228919):
* Add templating and support for Python 3.13
* Add templating and support for Python 3.13
* Change warning to RuntimeError for version incompatibility.
* reflection returns original_request.
- Added fix-return-values.patch for compile failures
- Removed obsolete terminate.patch
-------------------------------------------------------------------
Wed Jul 17 10:56:55 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.65.0:
* [Python O11y] Implement CSM observability for Python
(gh#grpc/grpc#36557).
* [Python AIO] Return EOF from UnaryStreamCall.read() as
documented (gh#grpc/grpc#36660).
* [Python Otel] Deprecate target_attribute_filter
(gh#grpc/grpc#36697).
* [Python Server] Remove abstractmethod notation for
add_registered_method_handlers (gh#grpc/grpc#36684).
- Drop python-grpcio-cython3-compat.patch: upstreamed.
- Rebase xxhash-avoid-armv6-unaligned-access.patch and
xxhash-ppc64le-gcc7.patch to apply with -p1 from top level dir,
for easier maintenance.
-------------------------------------------------------------------
Sun Apr 21 16:12:45 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 1.62.2:
* [Fix Python Deadlock] Guard
grpc_google_default_credentials_create with nogil
-------------------------------------------------------------------
Wed Mar 20 07:41:06 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.62.1:
* This release contains refinements, improvements, and bug
fixes.
-------------------------------------------------------------------
Mon Feb 26 19:09:09 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
- Version update in SLE 15 SP4 and later (jsc#PED-6697)
-------------------------------------------------------------------
Fri Feb 23 22:10:40 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.62.0:
* [Python AIO] Handle DeprecationWarnings when get current loop
(gh#grpc/grpc#35583).
* [Python AIO] Raise resource_exhausted error in case of
concurrent RPC limit exceeded (gh#grpc/grpc#35376).
* [Python O11y] Build and distrib O11y package
(gh#grpc/grpc#35578).
* [Python setuptools] Import error from distutils for lower
version of setuptools (gh#grpc/grpc#35561).
- Add terminate.patch: Fix control reaching end of non-void
function.
- Rebase python-grpcio-cython3-compat.patch for updated version.
-------------------------------------------------------------------
Fri Feb 9 12:10:38 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 1.60.1:
* Revert change to print backtrace in server
-------------------------------------------------------------------
Fri Dec 15 14:47:42 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
@@ -98,7 +12,7 @@ Wed Nov 22 17:38:11 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
when using gcc 7 (boo#1208794).
- add patch xxhash-avoid-armv6-unaligned-access.patch
do not expect unaligned accesses to work on armv6, it breaks
in our build setup using aarch64 kernels
in our build setup using aarch64 kernels
-------------------------------------------------------------------
Tue Oct 31 08:50:42 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
@@ -130,7 +44,7 @@ Sun Sep 17 13:22:25 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
-------------------------------------------------------------------
Wed Aug 30 17:07:21 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.57.0: (CVE-2023-4785, bsc#1215334, CVE-2023-33953, bsc#1214148)
- Update to version 1.57.0:
* [posix] Enable systemd sockets for libsystemd>=233
(gh#grpc/grpc#32671).
* [python O11Y] Initial Implementation (gh#grpc/grpc#32974).
@@ -169,7 +83,7 @@ Sun Jul 2 12:33:22 UTC 2023 - ecsos <ecsos@opensuse.org>
-------------------------------------------------------------------
Fri Jun 30 15:47:01 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.56.0: (CVE-2023-32731, bsc#1212180)
- Update to version 1.56.0:
* [aio types] Fix some grpc.aio python types
(gh#grpc/grpc#32475).
@@ -187,7 +101,7 @@ Sat Jun 10 16:26:53 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
-------------------------------------------------------------------
Fri Apr 28 04:39:48 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.54.0: (CVE-2023-32732, bsc#1212182)
- Update to version 1.54.0:
* Fix DeprecationWarning when calling asyncio.get_event_loop()
(gh#grpc/grpc#32533).
* Remove references to deprecated syntax field
@@ -235,7 +149,7 @@ Sat Jun 4 14:52:05 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1.46.3:
* backport: xds: use federation env var to guard new-style resource name parsing
* This release contains refinements, improvements, and bug fixes.
* This release contains refinements, improvements, and bug fixes.
-------------------------------------------------------------------
Fri May 6 17:37:43 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
@@ -290,7 +204,7 @@ Tue Feb 8 23:52:07 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
Tue Oct 26 20:44:15 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 1.41.1:
* This is release 1.41.0 (goat) of gRPC Core.
* This is release 1.41.0 (goat) of gRPC Core.
-------------------------------------------------------------------
Thu Oct 21 13:16:01 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>

16
python-grpcio.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-grpcio
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,23 @@
%global modname grpcio
# PYTHON2 NOT SUPPORTED BY UPSTREAM
%define skip_python2 1
%{?sle15_python_module_pythons}
Name: python-grpcio
Version: 1.69.0
Version: 1.60.0
Release: 0
Summary: HTTP/2-based Remote Procedure Call implementation
License: Apache-2.0
Group: Development/Languages/Python
URL: https://grpc.io
Source: https://files.pythonhosted.org/packages/source/g/grpcio/grpcio-%{version}.tar.gz
# PATCH-FIX-UPSTREAM python-grpcio-cython3-compat.patch gh#grpc/grpc#33918 badshah400@gmail.com -- Fix noexcept errors upon compiling with Cython 3+
Patch0: python-grpcio-cython3-compat.patch
# PATCH-FIX-SLE xxhash-avoid-armv6-unaligned-access.patch alarrosa@suse.com -- do not expect unaligned accesses to work on armv6
Patch1: xxhash-avoid-armv6-unaligned-access.patch
# PATCH-FIX-SLE xxhash-ppc64le-gcc7.patch boo#1208794 alarrosa@suse.com -- fix build failure on ppc64le when using gcc 7
Patch2: xxhash-ppc64le-gcc7.patch
Patch3: fix-return-values.patch
BuildRequires: %{python_module Cython >= 0.29.8}
BuildRequires: %{python_module devel >= 3.7}
BuildRequires: %{python_module pip}
@@ -57,7 +60,12 @@ and server applications to communicate, and enables the building of
connected systems.
%prep
%autosetup -p1 -n grpcio-%{version}
%autosetup -N -n grpcio-%{version}
%patch0 -p1
pushd third_party/xxhash
%patch1 -p1
%patch2 -p1
popd
%build
export GRPC_BUILD_WITH_BORING_SSL_ASM=false

6
xxhash-avoid-armv6-unaligned-access.patch
View File

@@ -1,7 +1,7 @@
Index: grpcio/third_party/xxhash/xxhash.h
Index: xxHash-0.8.1/xxhash.h
===================================================================
--- grpcio.orig/third_party/xxhash/xxhash.h
+++ grpcio/third_party/xxhash/xxhash.h
--- xxHash-0.8.1.orig/xxhash.h
+++ xxHash-0.8.1/xxhash.h
@@ -1408,7 +1408,7 @@ XXH3_128bits_reset_withSecretandSeed(XXH
(defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
( \

6
xxhash-ppc64le-gcc7.patch
View File

@@ -7,10 +7,10 @@ Subject: [PATCH] Fix compilation on RHEL 7 ppc64le (gcc 4.8)
xxhash.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/third_party/xxhash/xxhash.h b/third_party/xxhash/xxhash.h
diff --git a/xxhash.h b/xxhash.h
index 08ab794..7850622 100644
--- a/third_party/xxhash/xxhash.h
+++ b/third_party/xxhash/xxhash.h
--- a/xxhash.h
+++ b/xxhash.h
@@ -4129,7 +4129,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc,
const void* XXH_RESTRICT secret)
{