dev-python/grpcio{,-tools} : version bump

4 files changed, 115 insertions, 67 deletions

diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index c53eb55d..930ec826 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1 +1 @@
-DIST grpcio-1.59.0.tar.gz 24842974 BLAKE2B d883d9800f5b2025774c37a6c076500e113121b7e1254368d9c4b95c1170593969af4568492744527f909f828121630dd870210d2e2de718ba907be09f9b826b SHA512 1b345c2b87593934aa15e8019d858c6f7000d3e66ffd20ae538028aa109d8553ccff819ad8796b19c51d647851139d13b9158c9f2639b0b9506347ceff646637
+DIST grpcio-1.62.0.tar.gz 26315723 BLAKE2B a49156538644f66af7a569c0a91eb48a5d15177a8aa7c4410c4f8ea54f18893f2ca6d10a522a73f4e4d8950372aa35e8bc909f062b89db0a40e8765cebd43a23 SHA512 cd54cf3c2d296faca2f7b4eb13385e407aa09be752234585cb71b53afd1bc48fd8aca01eac1a4e2583a0ef07a902b84c887413d6678210c5f38a91a13960e826
diff --git a/dev-python/grpcio/files/1.59.0-cython3.patch b/dev-python/grpcio/files/1.59.0-cython3.patch
deleted file mode 100644
index 67834966..00000000
--- a/dev-python/grpcio/files/1.59.0-cython3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2023-09-29 00:27:01.000000000 +0100
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2023-10-20 23:32:19.961712516 +0100
-@@ -48,7 +48,7 @@
-     @staticmethod
-     cdef void functor_run(
-             grpc_completion_queue_functor* functor,
--            int succeed)
-+            int succeed) noexcept
- 
-     cdef grpc_completion_queue_functor *c_functor(self)
- 
-diff -Nur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2023-09-29 00:27:01.000000000 +0100
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2023-10-20 23:32:19.961712516 +0100
-@@ -50,7 +50,7 @@
-     @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():
-diff -Nur a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
---- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2023-09-29 00:27:01.000000000 +0100
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2023-10-20 23:39:10.583700341 +0100
-@@ -314,7 +314,7 @@
-   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:
-diff -Nur a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
---- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2023-09-29 00:27:01.000000000 +0100
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2023-10-20 23:32:19.960712516 +0100
-@@ -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:
diff --git a/dev-python/grpcio/files/1.62.0-cython3.patch b/dev-python/grpcio/files/1.62.0-cython3.patch
new file mode 100644
index 00000000..e734a7bd
--- /dev/null
+++ b/dev-python/grpcio/files/1.62.0-cython3.patch
@@ -0,0 +1,107 @@
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2024-03-05 18:46:12.903254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi	2024-03-05 18:46:42.989252881 +0800
+@@ -48,7 +48,7 @@
+     @staticmethod
+     cdef void functor_run(
+             grpc_completion_queue_functor* functor,
+-            int succeed)
++            int succeed) noexcept
+ 
+     cdef grpc_completion_queue_functor *c_functor(self)
+ 
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2024-03-05 18:46:12.903254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi	2024-03-05 18:47:00.094251906 +0800
+@@ -50,7 +50,7 @@
+     @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():
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2024-03-05 18:46:12.903254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi	2024-03-05 18:48:02.097248368 +0800
+@@ -316,7 +316,7 @@
+   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:
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi	2024-03-05 18:46:12.902254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi	2024-03-05 19:16:29.155150966 +0800
+@@ -12,10 +12,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-cdef void __prefork() nogil
++cdef void __prefork() noexcept nogil
+ 
+ 
+-cdef void __postfork_parent() nogil
++cdef void __postfork_parent() noexcept nogil
+ 
+ 
+-cdef void __postfork_child() nogil
+\ No newline at end of file
++cdef void __postfork_child() noexcept nogil
+\ No newline at end of file
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi	2024-03-05 18:46:12.903254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi	2024-03-05 19:17:17.124148229 +0800
+@@ -35,7 +35,7 @@
+ 
+ _fork_handler_failed = False
+ 
+-cdef void __prefork() nogil:
++cdef void __prefork() noexcept nogil:
+     with gil:
+         global _fork_handler_failed
+         _fork_handler_failed = False
+@@ -49,14 +49,14 @@
+             _fork_handler_failed = True
+ 
+ 
+-cdef void __postfork_parent() nogil:
++cdef void __postfork_parent() noexcept nogil:
+     with gil:
+         with _fork_state.fork_in_progress_condition:
+             _fork_state.fork_in_progress = False
+             _fork_state.fork_in_progress_condition.notify_all()
+ 
+ 
+-cdef void __postfork_child() nogil:
++cdef void __postfork_child() noexcept nogil:
+     with gil:
+         try:
+             if _fork_handler_failed:
+diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
+--- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2024-03-05 18:46:12.903254598 +0800
++++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi	2024-03-05 19:17:53.735146140 +0800
+@@ -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:
diff --git a/dev-python/grpcio/grpcio-1.59.0-r1.ebuild b/dev-python/grpcio/grpcio-1.62.0.ebuild
index 68d55056..e0567c1b 100644
--- a/dev-python/grpcio/grpcio-1.59.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.62.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit distutils-r1 multiprocessing prefix pypi
 
@@ -14,24 +14,24 @@ HOMEPAGE="https://grpc.io"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
 	>=dev-libs/re2-0.2021.11.01:=
-	>=dev-python/cython-0.29.36[${PYTHON_USEDEP}]
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-4.21.3[${PYTHON_USEDEP}]
 	net-dns/c-ares:=
 	sys-libs/zlib:=
 "
-
 DEPEND="${RDEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/1.62.0-cython3.patch"
+)
 
 python_prepare_all() {
-	if has_version ">=dev-python/cython-3.0.0[${PYTHON_USEDEP}]"; then
-		PATCHES=( "${FILESDIR}/1.59.0-cython3.patch" )
-	fi
 	distutils-r1_python_prepare_all
 	hprefixify setup.py
 }