py-grpcio: updated to 1.20.0

Release v1.20.0
Add Python example for error handling.
python docs: details are UTF-8 encodable, not just ASCII.
Use C-Core API to perform time conversion.
Use correct C integer types in Cython.
Add the missing grpc_cfstream dependency.
Strip Python wheel binary.
Simplify batch operations event interpretation.
add enter_graceful_shutdown() to health service.

3 files changed, 20 insertions, 32 deletions

diff --git a/net/py-grpcio/Makefile b/net/py-grpcio/Makefile
index bd1ebbbeafd..f6ff216b5be 100644
--- a/net/py-grpcio/Makefile
+++ b/net/py-grpcio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2019/03/28 17:35:14 leot Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/19 07:31:47 adam Exp $
 
-DISTNAME=	grpcio-1.19.0
+DISTNAME=	grpcio-1.20.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	net
+CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio/}
 
 MAINTAINER=	kethzer.dr@gmail.com
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-protobuf>=3.5.0:../../devel/py-protobuf
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 
 .include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27"
+.if ${_PYTHON_VERSION} == 27
 DEPENDS+=       ${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34
 DEPENDS+=       ${PYPKGPREFIX}-futures>=2.2.0:../../devel/py-futures
 .endif
diff --git a/net/py-grpcio/distinfo b/net/py-grpcio/distinfo
index efb7061df00..551c01b07ca 100644
--- a/net/py-grpcio/distinfo
+++ b/net/py-grpcio/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2019/03/28 17:35:14 leot Exp $
+$NetBSD: distinfo,v 1.6 2019/04/19 07:31:47 adam Exp $
 
-SHA1 (grpcio-1.19.0.tar.gz) = 983938931832781234193373783d41341b8a7714
-RMD160 (grpcio-1.19.0.tar.gz) = d507dd96643d42f9bee3ddf327cb6c7f4e93fbb4
-SHA512 (grpcio-1.19.0.tar.gz) = 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
-Size (grpcio-1.19.0.tar.gz) = 14621509 bytes
-SHA1 (patch-setup.py) = 297fd7c363998e1e58bd4f24724b84626d419634
+SHA1 (grpcio-1.20.0.tar.gz) = 7ab5d177041ae2a91a8e822a835b5f1bec2c589b
+RMD160 (grpcio-1.20.0.tar.gz) = 891a453f5c34fb050eab71a43334f8cbe2d7a97c
+SHA512 (grpcio-1.20.0.tar.gz) = a8c3248fed03112676caf329a254f318d5a61d0f704f8d6aaa1a45337172d02b13bffdac5b9d552e7e324ed47d6d66cf2cec22e35dab64f815dc9cca700756d4
+Size (grpcio-1.20.0.tar.gz) = 13879291 bytes
+SHA1 (patch-setup.py) = 68bbc17adeb570dd6be3dbf878638a247655f14a
 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a
-SHA1 (patch-src_python_grpcio_commands.py) = 10c9342a0a1e2fa70e85ed107b51e9a011f76a2c
diff --git a/net/py-grpcio/patches/patch-setup.py b/net/py-grpcio/patches/patch-setup.py
index a8bb8c61e83..6dd317ec292 100644
--- a/net/py-grpcio/patches/patch-setup.py
+++ b/net/py-grpcio/patches/patch-setup.py
@@ -1,13 +1,14 @@
-$NetBSD: patch-setup.py,v 1.3 2019/03/28 17:35:14 leot Exp $
+$NetBSD: patch-setup.py,v 1.4 2019/04/19 07:31:47 adam Exp $
 
 Use dependencies in pkgsrc.
 
---- setup.py.orig	2019-02-26 17:31:26.000000000 +0000
+--- setup.py.orig	2019-04-15 23:12:51.000000000 +0000
 +++ setup.py
-@@ -207,18 +207,19 @@ EXTENSION_INCLUDE_DIRECTORIES = (
+@@ -206,19 +206,7 @@ EXTENSION_INCLUDE_DIRECTORIES = (
+     (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
      NANOPB_INCLUDE + CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
  
- EXTENSION_LIBRARIES = ()
+-EXTENSION_LIBRARIES = ()
 -if "linux" in sys.platform:
 -  EXTENSION_LIBRARIES += ('rt',)
 -if not "win32" in sys.platform:
@@ -20,32 +21,20 @@ Use dependencies in pkgsrc.
 -  EXTENSION_LIBRARIES += ('z',)
 -if BUILD_WITH_SYSTEM_CARES:
 -  EXTENSION_LIBRARIES += ('cares',)
-+#if "linux" in sys.platform:
-+#  EXTENSION_LIBRARIES += ('rt',)
-+#if not "win32" in sys.platform:
-+#  EXTENSION_LIBRARIES += ('m',)
-+#if "win32" in sys.platform:
-+#  EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
-+#if BUILD_WITH_SYSTEM_OPENSSL:
-+#  EXTENSION_LIBRARIES += ('ssl', 'crypto',)
-+#if BUILD_WITH_SYSTEM_ZLIB:
-+#  EXTENSION_LIBRARIES += ('z',)
-+#if BUILD_WITH_SYSTEM_CARES:
-+#  EXTENSION_LIBRARIES += ('cares',)
-+EXTENSION_LIBRARIES += ('grpc',)
++EXTENSION_LIBRARIES = ('grpc',)
  
  DEFINE_MACROS = (('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600))
  if not DISABLE_LIBC_COMPATIBILITY:
-@@ -265,7 +266,7 @@ def cython_extensions_and_necessity():
+@@ -265,7 +253,7 @@ def cython_extensions_and_necessity():
                    for name in CYTHON_EXTENSION_MODULE_NAMES]
    config = os.environ.get('CONFIG', 'opt')
    prefix = 'libs/' + config + '/'
--  if "darwin" in sys.platform or USE_PREBUILT_GRPC_CORE:
-+  if False and "darwin" in sys.platform or USE_PREBUILT_GRPC_CORE:
+-  if USE_PREBUILT_GRPC_CORE:
++  if False:
      extra_objects = [prefix + 'libares.a',
                       prefix + 'libboringssl.a',
                       prefix + 'libgpr.a',
-@@ -277,7 +278,7 @@ def cython_extensions_and_necessity():
+@@ -277,7 +265,7 @@ def cython_extensions_and_necessity():
    extensions = [
        _extension.Extension(
            name=module_name,