onkelbeh/HomeAssistantRepository
4
7
Fork 10
Code Issues 227 Pull Requests 1 Releases 411 Wiki Activity

Merge branch 'cython3-compat'

Browse Source 
Closes: #2364
Closes: #2210
This commit is contained in:
Andreas Billmeier 2023-11-03 16:05:14 +01:00 committed by Andreas Billmeier
commit 0012c7baa7
Signed by: onkelbeh
GPG Key ID: E6DB12C8C550F3C0
9 changed files with 71 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-python/dbus-fast/Manifest
View File

@ -3,5 +3,5 @@ DIST dbus_fast-2.11.1.tar.gz 68765 BLAKE2B 03cb95e4c9344784a0d57b93f76a844db5350
DIST dbus_fast-2.12.0.tar.gz 68809 BLAKE2B 7484543abd8fb7ba6ee636370b6dc9ab6bffa9a65b46ba07122daa1a8e3d49234c30314b45412898a3c5b8188eadb0b33d3767d5b7ad19f26d3fe51c50eff522 SHA512 31091a68ea707c8903456a1b9d1cf873eb33a1ee22056055286084666edd1cfc5f24582521bf40dc0afce1326a7573003f86562e67e680b2b45bfb8911a50548
EBUILD dbus-fast-1.84.2.ebuild 695 BLAKE2B 71386d6e7d98562f84be63a3bc94629a70c55fff376dd99e4792a4b6885ecf0db42dcf1b408ea3e9b5ddf2378361f354835d5027743fcd8913589f6e7801c54f SHA512 5dd8abed232175554b4a97165e06c56cadbc1c4fa0ed97af6fe0c9c6186458533f7bd0acfe243728ba16ef1cef2b9ba5e6d4b335a68e7fe27749fc9e51cf2953
EBUILD dbus-fast-2.11.1.ebuild 633 BLAKE2B d4323048a401b87d243bcdf8085d18b863fdc18b4f1e55aa07d3777a34804e16e1a4707a056e4c51ed8c198ac4360ad639316ebda448b6a71978857ebef728c2 SHA512 52ab49887d5f64aa65308423767955c79bf44800afbf0b18a9f5b929418d725d34f7955eda2e84cf165e40d091da718da2e77c5c04a2e7846ae6557e22b3618f
EBUILD dbus-fast-2.12.0.ebuild 673 BLAKE2B 83f98c03fbb3e7eb879eea1fd815ca8b65a3a1036b23f004c185635d6be103a39a8eca9fb24cf1a5ce6f30bc3a9f2ee18ed8032fc57c3301a3f75c6a3707d672 SHA512 960e99f58de6b9f593e58c9a66e0064bea3fcd495e667c514b16bd5e3aa624085b756690b7c670a1857394c5c00c4082e700c80f8b3cfc5129ba80eb39967985
EBUILD dbus-fast-2.12.0.ebuild 674 BLAKE2B ecbee3414af734e1122cbd5451125d4d8457069fb18ff9365ce14a3582aefe64977de5632c081d3bef99f2386e816a9a59c82a7b03a56623bf36d81c549fe815 SHA512 eecfd4bbd18d153bfaf52a19244588f6e0401fa05640f1ece954dc0c927b1cee4adc18c89b1cf02410ccb930281cff71bd63c8b8238a8bfc84e30f5cc011b083
MISC metadata.xml 536 BLAKE2B a40db9bdf197d24d699a8bd057de139bd22e971e7c65d63761158a2a2ffc7c609925d93a4a4249d09e5290a2102fde9e8d72569ebf163a78aa108a3221d14d25 SHA512 957a46de989121f016a5c78ae73569e420b030265e1bc8568452171374c6727a5f1fc93c6c97ac95976d1541907c5676b4032d3f0fcd1b9dad1c57e4c72f50b7

2
dev-python/dbus-fast/dbus-fast-2.12.0.ebuild
View File

@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
DOCS="README.md"
BDEPEND="
<dev-python/cython-3[${PYTHON_USEDEP}]
>=dev-python/cython-3[${PYTHON_USEDEP}]
test? (
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-cov[${PYTHON_USEDEP}]

2
dev-python/grpcio-reflection/Manifest
View File

@ -3,5 +3,5 @@ DIST grpcio-reflection-1.58.0.tar.gz 18284 BLAKE2B 5a251839ac1ff06de9257fb1bfe9e
DIST grpcio-reflection-1.59.0.tar.gz 18349 BLAKE2B 2192d87fed7c7f8d6546e66c4190622cc2752bb3626c514db01827a7496f67f54a0bc30dcf5a871d8699b010d744861f46ce8f5a51714e965e5a2b1f3446742c SHA512 829e985458e09f25c04717c950456cedb94d9b57483726b526181b382c4ff2068b6a6225cd40ae0d94cdef85d39f95a5a43a1ef3a9339179d52c0d7221404006
EBUILD grpcio-reflection-1.51.1.ebuild 703 BLAKE2B 3fcbe914581a4a272096048db6a34cfece57345b3912cc126a53989551ba2cfb456b77ebbbaec871ebbe8fe4601d078d360034258a3e89aeb5e15c18cb2b1f5d SHA512 9f823be058fb8b56fc32ea321a791d9870f47a1632e16b06ee717ea772160860720c4ce17ca2087b52119056c2ef7c73baa6cf340549d912d0608c79f336baa3
EBUILD grpcio-reflection-1.58.0.ebuild 789 BLAKE2B f8b4fab314c528a2e5300b127f9e185a9721de107b31a1c0d5b96166da2e20ffb19cb85301735b89d69e1d87b71a11b887535f3e805e98f82d7ecb06cfd0a282 SHA512 47d1e3a08bba3ba2470f3c82f20f4e75f68f7787e8e55c0a23025ddb4d3f8132046aafc5f957d8747a4e216500d35be9b552a22269466039f0f71c64af717b24
EBUILD grpcio-reflection-1.59.0.ebuild 789 BLAKE2B f8b4fab314c528a2e5300b127f9e185a9721de107b31a1c0d5b96166da2e20ffb19cb85301735b89d69e1d87b71a11b887535f3e805e98f82d7ecb06cfd0a282 SHA512 47d1e3a08bba3ba2470f3c82f20f4e75f68f7787e8e55c0a23025ddb4d3f8132046aafc5f957d8747a4e216500d35be9b552a22269466039f0f71c64af717b24
EBUILD grpcio-reflection-1.59.0.ebuild 744 BLAKE2B 29ba2ab08ac1769879baab0aacf5f261406cecbb210caca3860fde1dd96885c60d00e8b3b5169a7467bf76a2a1b7d3a30a951b253aed55112a03716f58ae4a1d SHA512 b8e4b1ffe9456e6e3076b6b39240dc760d306204890131f27829c9eac4ae178fcae2e54d8eb62f8d27fb1177c5fe70004bb38de42af6fbe11909a2b065860fa6
MISC metadata.xml 470 BLAKE2B c57c9c16cf1aa425f456171979590c6d62f926ef49d7b24de7372462322a6d1931835864dfc7e5461a1a6f52923bb9a6d37feee8f15bc6b4b10bc93da603773e SHA512 fb2f1191cbed33beddfdf8e0d6fd6980e6d1475e32f5ada6fb3d8e69a0c93726d60bff8dc3e9eca525d9e597ad018e84f2a6f2927fdde2d5c145d0841fcca550

3
dev-python/grpcio-reflection/grpcio-reflection-1.59.0.ebuild
View File

@ -22,8 +22,7 @@ DOCS="README.rst"
RDEPEND=">=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
>=dev-python/protobuf-python-4.21.6"
BDEPEND="
>=dev-python/cython-0.29.8[${PYTHON_USEDEP}]
<dev-python/cython-3[${PYTHON_USEDEP}]
>=dev-python/cython-3[${PYTHON_USEDEP}]
test? (
dev-python/pytest[${PYTHON_USEDEP}]
)"

2
dev-python/grpcio-status/Manifest
View File

@ -3,5 +3,5 @@ DIST grpcio-status-1.58.0.tar.gz 13524 BLAKE2B 4a75179e8c71cd3e10837bc53c264df1a
DIST grpcio-status-1.59.0.tar.gz 13554 BLAKE2B 8b4c13e27d5c7c5b4d9d3073f3593a67f6729103da7717c81c4f68e509a1ffbea500218afed1b0499220dad8e21d3d16f9bc9dae96de404bd1a5b1259569806c SHA512 f6fb6da7ec990b747560756f0b2375e993f12cc97fafbfcc96364dbeabdfd3b9afb4caaa0ac5b8bc24e651b28e0ee750bb1e5df0e280d8b5f86739f698acd599
EBUILD grpcio-status-1.51.1.ebuild 655 BLAKE2B eb4cf114f7efaaaa803b43538db9ff0ce99611e65adce349f0f91235cd11c8a0197e897b7ae9ef2d319df4869a48ed720b93407005a6652a54fcd22ddce9f325 SHA512 54595402fc28407c3816411848501c208035e1157a80914e065c4df4e4ec8eae25640ea83b2aa971e726814d5a764986c53d9110b0c56099cc1b46b47cbc48a6
EBUILD grpcio-status-1.58.0.ebuild 750 BLAKE2B 59b87752d05be79bfce4d1c5ab8ead26d91af05b28cc459709473de4ec72bc15a5dd625736056cdc916aab35f00804366143e44451dd1101f035ea5c66a045a3 SHA512 05c3d43333cc336a2bd697fd2b5f0e2272c416527f80eff2b11a543b6bdb7f7e6fccaac145dcf6e7d15c85a0e5979e746360d8ec78a1326da5b1462700f6b67a
EBUILD grpcio-status-1.59.0.ebuild 711 BLAKE2B 9929c857ae16e1ebd995f274637e9edea71a091396e54c0b79f136ddc19a0f0201e691a9e9f49514d4d9ec13207f755b6caebb600d5b8f891650a8b40afabdfd SHA512 e449bfae035e3b9f1e9b9d9f5f04e4ed2f0ab446fc9baa34ff823fc51746b4efd3a22331a479b74f68aa16914f500bdfa76f3c4abdbfdfc778dbc044abb6c256
EBUILD grpcio-status-1.59.0.ebuild 712 BLAKE2B 67bed978eb0d3f31f0cbe454de75df8711137d27fccdb9db6165048429b2aef816274a9981abaafcf60ebee7096230ead9522f9cdb2101c8fbcc09d2d95b6e33 SHA512 d6b2af4f7bd5c1682cb4527e1ccf98f13515e102c6303afd6f2fbc13ab27738811335296435310f3c9a6216b3885c7dd6001a290a360ef0992da8afb99dbfb04
MISC metadata.xml 466 BLAKE2B 2dea51ed840c7921d330cfc0513710d6ef2c0b2088c5e4dce4c60f0ee90a666e49e07b4736c8745ecdb5f090fe4c06e2115ca9a842834591b01326b23a649480 SHA512 48903796b3558afe4d1ba20f46c1f4f86b25693a57169ada1de56e89af460c31d10ef737ee0c1a267147783113d73d5de9ce7f3736d30cc6f101c4caa2940c4e

2
dev-python/grpcio-status/grpcio-status-1.59.0.ebuild
View File

@ -22,6 +22,6 @@ DOCS="README.rst"
RDEPEND=">=dev-python/protobuf-python-4.21.6[${PYTHON_USEDEP}]
>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
>=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}]"
BDEPEND="<dev-python/cython-3[${PYTHON_USEDEP}]"
BDEPEND=">=dev-python/cython-3[${PYTHON_USEDEP}]"
distutils_enable_tests pytest

3
dev-python/grpcio/Manifest
View File

@ -1,9 +1,10 @@
AUX 1.37.1-cc-flag-test-fix.patch 1053 BLAKE2B c2f6b0a506fc2d074e656db3081447b3a0521a2ed2bd14a19104b962e0ad45b0068116384403eaf199d2bb8027b4a260dfaa7ed274974ad0bb6ca56b9ad19e8b SHA512 72dc39d549a008d137db29aa446ab7fc0add575103e941a969bed0124ce3b285f27edc31ca06db71b2dd3232c77c280755de3d3ef257792ead0516122f0a9b3f
AUX cython3-compat.patch 3033 BLAKE2B e167f7e07eb34c86913fca6a920551785fb2c40dc52634691c1c93a443f0ce248d32ca0a5f38b41960cf82c3097e57c89a8697cd0277063755a92a3bd1b9d512 SHA512 7c6502b5abffb262ce80c219ab4971d620ffe0742ad427cb902d5d5a3bbe9ee5818d13f59c16d1b5c57f97b1fed2b8fbccf156fb02534a4fd29eb84b29ae9671
AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
DIST grpcio-1.51.1.tar.gz 22137648 BLAKE2B 71793a916bf5f1967ca2b74742d9cc5f4c65dd3fb153bcbab9ec760eff78addb1a84ac158638fa53e8ac25c505008c27101b2b0422c0ddceaebc78793cabe44d SHA512 6133ac7518477a2c0bb4aa95d3631dfb1f2c2526e853e056a47dc567211905dc2a31714481b97596253cd72dbbb8a34af3c644909ffe7b87b8ba71ec726c04a0
DIST grpcio-1.58.0.tar.gz 24784339 BLAKE2B 6b0d80aab3599f6f3633c4fd222aec550bef5aa6205007cb1dfee7704582cecaad51f78a15931480154e30a453df13ee26352429dc0b98bcb217b321c0e19aa4 SHA512 6c2de8de216c5059e8c7842e491be3e4c6fe9f3c40d3980560cacaa11c9fb066634a59540cc61a882be1976e8b3e0f1be7f272740b025aaeb96d8f47eee1cc35
DIST grpcio-1.59.0.tar.gz 24842974 BLAKE2B d883d9800f5b2025774c37a6c076500e113121b7e1254368d9c4b95c1170593969af4568492744527f909f828121630dd870210d2e2de718ba907be09f9b826b SHA512 1b345c2b87593934aa15e8019d858c6f7000d3e66ffd20ae538028aa109d8553ccff819ad8796b19c51d647851139d13b9158c9f2639b0b9506347ceff646637
EBUILD grpcio-1.51.1.ebuild 1343 BLAKE2B bd958529484898a5888b314e73871e6930e06453753cbf837f29e6c7f593b8c20518359c5a8aa7ac3f845d21f5831b319664c70acebd7783a617d5c8f82b73b0 SHA512 dbfbdb1a2c7e822954320cdbc075dbbec37ca234598e1d13c99019060bc027a5b851c4cb6bb9d592c3939403e41bbe7a75605d0631bcc2a92148e7f741343668
EBUILD grpcio-1.58.0.ebuild 1343 BLAKE2B bd958529484898a5888b314e73871e6930e06453753cbf837f29e6c7f593b8c20518359c5a8aa7ac3f845d21f5831b319664c70acebd7783a617d5c8f82b73b0 SHA512 dbfbdb1a2c7e822954320cdbc075dbbec37ca234598e1d13c99019060bc027a5b851c4cb6bb9d592c3939403e41bbe7a75605d0631bcc2a92148e7f741343668
EBUILD grpcio-1.59.0.ebuild 1249 BLAKE2B 4877225ecf9275b57c3d10dd5d4e8115ed2679d61c4b8713fd77b7e348837068768ef596605946c9e9d3b079d6bfa311f7bb0d1b95d190d509531684884ba798 SHA512 c6d0111da64174c58049106978d6d3209e1fc1cb269baa2ddce89757b70772fdc15c2edd1395f0c16e7656bfc6f71d44542f56742f22482ec0ec39dfc95f1d50
EBUILD grpcio-1.59.0.ebuild 1298 BLAKE2B c04da27e2978daf49e282c2ceec4dec11885946b3e2c30e8e9b7f04fe72cc3798d0a2e5e58e3de39e5fe4025c704fa25744511e4dee05d0aeac073a2c7f7d0e2 SHA512 8ec908d6869c0f60b63c6415706364abf7bcd20bb7f5de6571e58dcc3a71bb763486520aa44e7e9e5a720250565523d2db4df397a76faf8d7c4658dbb1d4da3c
MISC metadata.xml 459 BLAKE2B 2e6951c9a3d03ad5f1adf5585f18d918eff98b9a7bf93732bb8696fcd4a289a3f95b018f0686a65e454e1ceca763e47052d7b12204ab352b36137c394b43d8dc SHA512 2cb333c14fca4563ef4461d42f1f3d42343907efb8bf2893722bf7355e0828c101a7391f242f2df0160355c7cd890497643308dbd2275d3069d98f8b15653bf2

60
dev-python/grpcio/files/cython3-compat.patch Normal file
View File

@ -0,0 +1,60 @@
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 2023-09-06 03:32:05.000000000 +0200
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2023-10-28 06:56:59.975270836 +0200
@@ -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 2023-09-06 03:32:05.000000000 +0200
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2023-10-28 06:56:20.002663936 +0200
@@ -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 2023-09-06 03:32:05.000000000 +0200
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2023-10-28 06:54:57.193406642 +0200
@@ -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 -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 2023-09-06 03:32:05.000000000 +0200
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2023-10-28 06:53:41.609259047 +0200
@@ -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:

4
dev-python/grpcio/grpcio-1.59.0.ebuild
View File

@ -24,7 +24,9 @@ RDEPEND="
"
BDEPEND="${RDEPEND}
<dev-python/cython-3[${PYTHON_USEDEP}]"
>=dev-python/cython-3[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}/cython3-compat.patch" )
python_prepare_all() {
distutils-r1_python_prepare_all