Received: by mail.netbsd.org (Postfix, from userid 605) id 628E584D9E; Thu, 24 Oct 2019 18:34:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DC46D84D9D for ; Thu, 24 Oct 2019 18:34:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id My0d8h5A7nr9 for ; Thu, 24 Oct 2019 18:34:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0A1EB84D95 for ; Thu, 24 Oct 2019 18:34:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0236DFA84; Thu, 24 Oct 2019 18:34:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1571942057231380" MIME-Version: 1.0 Date: Thu, 24 Oct 2019 18:34:17 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20191024183418.0236DFA84@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1571942057231380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Oct 24 18:34:17 UTC 2019 Modified Files: pkgsrc/net/py-grpcio: Makefile distinfo pkgsrc/net/py-grpcio-tools: Makefile distinfo pkgsrc/net/py-grpcio-tools/patches: patch-setup.py pkgsrc/net/py-grpcio/patches: patch-setup.py Log Message: py-grpcio[-tools]: updated to 1.24.3 1.24.3 Add strip_prefix to python protoc plugin and py_grpc_library. Switch py_proto_library from using src to deps to conform with google3. Expose local credentials on Python layer. Make default vtable for pointer argument a constant. Gracefully handle errors from Future object callbacks. Gracefully handle exceptions raised by signal handlers on the main thread while unary RPCs are in flight. Separate py_grpc_library and py_proto_library. Add wait_for_termination method to grpc.Server. Add Python Cancellation Example. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/py-grpcio/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/py-grpcio/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/py-grpcio-tools/Makefile \ pkgsrc/net/py-grpcio-tools/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-grpcio/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1571942057231380 Content-Disposition: inline Content-Length: 8415 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/py-grpcio/Makefile diff -u pkgsrc/net/py-grpcio/Makefile:1.9 pkgsrc/net/py-grpcio/Makefile:1.10 --- pkgsrc/net/py-grpcio/Makefile:1.9 Thu Oct 3 08:10:09 2019 +++ pkgsrc/net/py-grpcio/Makefile Thu Oct 24 18:34:17 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2019/10/03 08:10:09 adam Exp $ +# $NetBSD: Makefile,v 1.10 2019/10/24 18:34:17 adam Exp $ -DISTNAME= grpcio-1.23.1 +DISTNAME= grpcio-1.24.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio/} Index: pkgsrc/net/py-grpcio/distinfo diff -u pkgsrc/net/py-grpcio/distinfo:1.11 pkgsrc/net/py-grpcio/distinfo:1.12 --- pkgsrc/net/py-grpcio/distinfo:1.11 Thu Oct 3 08:10:09 2019 +++ pkgsrc/net/py-grpcio/distinfo Thu Oct 24 18:34:17 2019 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2019/10/03 08:10:09 adam Exp $ +$NetBSD: distinfo,v 1.12 2019/10/24 18:34:17 adam Exp $ -SHA1 (grpcio-1.23.1.tar.gz) = f22d3e519334b16100fe5ec350ca8bfd556065b4 -RMD160 (grpcio-1.23.1.tar.gz) = 690d73120081bf43baf13c35baa495aa5e27e109 -SHA512 (grpcio-1.23.1.tar.gz) = 4f8868d88876379d11520a5726c18506a88a0c99be1d32a47b3159a6b5c1313fda2b1c67112113a6459b5305a270148b683e95cf3d3b62a175c4597bd9779374 -Size (grpcio-1.23.1.tar.gz) = 13976733 bytes -SHA1 (patch-setup.py) = 68bbc17adeb570dd6be3dbf878638a247655f14a +SHA1 (grpcio-1.24.3.tar.gz) = 14178327f815d95883e00c5ab1cc1ecbad7a6533 +RMD160 (grpcio-1.24.3.tar.gz) = 8185ee2b42573017b19fb90cbb55b1976b841398 +SHA512 (grpcio-1.24.3.tar.gz) = 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce +Size (grpcio-1.24.3.tar.gz) = 14030592 bytes +SHA1 (patch-setup.py) = eb7e9a110711d149bae7cc4f4b08e725ffc25ae5 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a Index: pkgsrc/net/py-grpcio-tools/Makefile diff -u pkgsrc/net/py-grpcio-tools/Makefile:1.7 pkgsrc/net/py-grpcio-tools/Makefile:1.8 --- pkgsrc/net/py-grpcio-tools/Makefile:1.7 Thu Oct 3 08:10:09 2019 +++ pkgsrc/net/py-grpcio-tools/Makefile Thu Oct 24 18:34:17 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2019/10/03 08:10:09 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/10/24 18:34:17 adam Exp $ -DISTNAME= grpcio-tools-1.23.1 +DISTNAME= grpcio-tools-1.24.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-tools/} @@ -10,7 +10,7 @@ HOMEPAGE= https://grpc.io/ COMMENT= Protobuf code generator for gRPC LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-grpcio>=1.20.0:../../net/py-grpcio +DEPENDS+= ${PYPKGPREFIX}-grpcio>=1.24.3:../../net/py-grpcio DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.5.1:../../devel/py-protobuf USE_LANGUAGES= c c++11 Index: pkgsrc/net/py-grpcio-tools/distinfo diff -u pkgsrc/net/py-grpcio-tools/distinfo:1.7 pkgsrc/net/py-grpcio-tools/distinfo:1.8 --- pkgsrc/net/py-grpcio-tools/distinfo:1.7 Thu Oct 3 08:10:09 2019 +++ pkgsrc/net/py-grpcio-tools/distinfo Thu Oct 24 18:34:17 2019 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2019/10/03 08:10:09 adam Exp $ +$NetBSD: distinfo,v 1.8 2019/10/24 18:34:17 adam Exp $ -SHA1 (grpcio-tools-1.23.1.tar.gz) = 9f2429f46a86bf172cce91979fb6553061062f90 -RMD160 (grpcio-tools-1.23.1.tar.gz) = d7b057ba054a92780fe652673b7930ffe7bbdfa8 -SHA512 (grpcio-tools-1.23.1.tar.gz) = a6309e6ef6b0cc2e9b295b65c8d7316721ba25aed00a1396b58c902d6379fb2e5acf4036ccb4e3ead0bf602b9b53d0388d4899d5abac046125d8e1fbcf84e5d9 -Size (grpcio-tools-1.23.1.tar.gz) = 2021585 bytes -SHA1 (patch-setup.py) = ac7c9fbcd9f33a8824c18834bea9c4262f65f718 +SHA1 (grpcio-tools-1.24.3.tar.gz) = ebb6654f18aae6bc3eb2f4d68dd7e6083f22b3d4 +RMD160 (grpcio-tools-1.24.3.tar.gz) = 1304389b1e3309b64c757f5290a38ba10cc239b9 +SHA512 (grpcio-tools-1.24.3.tar.gz) = 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab +Size (grpcio-tools-1.24.3.tar.gz) = 1984292 bytes +SHA1 (patch-setup.py) = 080ba75a31b51631000e79006316e0a2d5ce6cee Index: pkgsrc/net/py-grpcio-tools/patches/patch-setup.py diff -u pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.2 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.3 --- pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.2 Fri Apr 19 09:58:50 2019 +++ pkgsrc/net/py-grpcio-tools/patches/patch-setup.py Thu Oct 24 18:34:17 2019 @@ -1,20 +1,20 @@ -$NetBSD: patch-setup.py,v 1.2 2019/04/19 09:58:50 adam Exp $ +$NetBSD: patch-setup.py,v 1.3 2019/10/24 18:34:17 adam Exp $ Use pthread on FreeBSD. Use external protobuf. ---- setup.py.orig 2019-04-15 23:12:52.000000000 +0000 +--- setup.py.orig 2019-10-22 19:40:19.000000000 +0000 +++ setup.py -@@ -88,7 +88,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: +@@ -108,7 +108,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti' if EXTRA_ENV_LINK_ARGS is None: EXTRA_ENV_LINK_ARGS = '' - if "linux" in sys.platform or "darwin" in sys.platform: + if "linux" in sys.platform or "darwin" in sys.platform or "freebsd" in sys.platform: EXTRA_ENV_LINK_ARGS += ' -lpthread' - elif "win32" in sys.platform and sys.version_info < (3, 5): - msvcr = cygwinccompiler.get_msvcr()[0] -@@ -101,11 +101,9 @@ if EXTRA_ENV_LINK_ARGS is None: + if check_linker_need_libatomic(): + EXTRA_ENV_LINK_ARGS += ' -latomic' +@@ -123,11 +123,9 @@ if EXTRA_ENV_LINK_ARGS is None: EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS) EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS) @@ -26,7 +26,7 @@ Use external protobuf. PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE) GRPC_PYTHON_TOOLS_PACKAGE = 'grpc_tools' -@@ -116,7 +114,7 @@ if "win32" in sys.platform: +@@ -138,7 +136,7 @@ if "win32" in sys.platform: DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),) if '64bit' in platform.architecture()[0]: DEFINE_MACROS += (('MS_WIN64', 1),) @@ -35,7 +35,7 @@ Use external protobuf. DEFINE_MACROS += (('HAVE_PTHREAD', 1),) # By default, Python3 distutils enforces compatibility of -@@ -163,7 +161,7 @@ def extension_modules(): +@@ -185,7 +183,7 @@ def extension_modules(): plugin_sources += [ os.path.join('grpc_tools', 'main.cc'), os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc') @@ -44,7 +44,7 @@ Use external protobuf. plugin_ext = extension.Extension( name='grpc_tools._protoc_compiler', -@@ -172,7 +170,6 @@ def extension_modules(): +@@ -194,7 +192,6 @@ def extension_modules(): '.', 'grpc_root', os.path.join('grpc_root', 'include'), Index: pkgsrc/net/py-grpcio/patches/patch-setup.py diff -u pkgsrc/net/py-grpcio/patches/patch-setup.py:1.4 pkgsrc/net/py-grpcio/patches/patch-setup.py:1.5 --- pkgsrc/net/py-grpcio/patches/patch-setup.py:1.4 Fri Apr 19 07:31:47 2019 +++ pkgsrc/net/py-grpcio/patches/patch-setup.py Thu Oct 24 18:34:17 2019 @@ -1,12 +1,12 @@ -$NetBSD: patch-setup.py,v 1.4 2019/04/19 07:31:47 adam Exp $ +$NetBSD: patch-setup.py,v 1.5 2019/10/24 18:34:17 adam Exp $ Use dependencies in pkgsrc. ---- setup.py.orig 2019-04-15 23:12:51.000000000 +0000 +--- setup.py.orig 2019-10-22 19:40:13.000000000 +0000 +++ setup.py -@@ -206,19 +206,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ( - (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE + - NANOPB_INCLUDE + CARES_INCLUDE + ADDRESS_SORTING_INCLUDE) +@@ -235,19 +235,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ( + UPB_GRPC_GENERATED_INCLUDE + + ZLIB_INCLUDE) -EXTENSION_LIBRARIES = () -if "linux" in sys.platform: @@ -25,7 +25,7 @@ Use dependencies in pkgsrc. DEFINE_MACROS = (('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600)) if not DISABLE_LIBC_COMPATIBILITY: -@@ -265,7 +253,7 @@ def cython_extensions_and_necessity(): +@@ -294,7 +282,7 @@ def cython_extensions_and_necessity(): for name in CYTHON_EXTENSION_MODULE_NAMES] config = os.environ.get('CONFIG', 'opt') prefix = 'libs/' + config + '/' @@ -34,7 +34,7 @@ Use dependencies in pkgsrc. extra_objects = [prefix + 'libares.a', prefix + 'libboringssl.a', prefix + 'libgpr.a', -@@ -277,7 +265,7 @@ def cython_extensions_and_necessity(): +@@ -306,7 +294,7 @@ def cython_extensions_and_necessity(): extensions = [ _extension.Extension( name=module_name, --_----------=_1571942057231380--