py-protobuf: updated to 3.12.1

Protocol Buffers v3.12.0

Python
[experimental] Added proto3 presence support.
[experimental] fast import protobuf module, only works with cpp generated code linked in.
Truncate 'float' fields to 4 bytes of precision in setters for pure-Python
implementation (C++ extension was already doing this).
Fixed a memory leak in C++ bindings.
Added a deprecation warning when code tries to create Descriptor objects
directly.
Fix unintended comparison between bytes and string in descriptor.py.
Avoid printing excess digits for float fields in TextFormat.
Remove Python 2.5 syntax compatibility from the proto compiler generated _pb2.py module code.
Drop 3.3, 3.4 and use single version docker images for all python tests

3 files changed, 157 insertions, 10 deletions

diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index be2d6683368..2028eb6b22c 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.26 2020/02/06 15:57:41 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/05/21 16:31:15 adam Exp $
 
-DISTNAME=	protobuf-3.11.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+DISTNAME=	protobuf-python-3.12.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
 CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/protobuf/}
+#MASTER_SITES=	${MASTER_SITE_PYPI:=p/protobuf/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=protocolbuffers/}
+GITHUB_PROJECT=	protobuf
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://developers.google.com/protocol-buffers/
 COMMENT=	Python bindings for protobuf
 LICENSE=	modified-bsd
 
+EGG_NAME=	${DISTNAME:S/-python//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-python//}/python
+
 DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9:../../lang/py-six
 
diff --git a/devel/py-protobuf/PLIST b/devel/py-protobuf/PLIST
index 27e0f2eaf4f..6bf936c8ac6 100644
--- a/devel/py-protobuf/PLIST
+++ b/devel/py-protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/07/12 19:57:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/05/21 16:31:15 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -52,6 +52,9 @@ ${PYSITELIB}/google/protobuf/internal/_api_implementation.so
 ${PYSITELIB}/google/protobuf/internal/_parameterized.py
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
+${PYSITELIB}/google/protobuf/internal/any_test_pb2.py
+${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/any_test_pb2.pyo
 ${PYSITELIB}/google/protobuf/internal/api_implementation.py
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -61,6 +64,21 @@ ${PYSITELIB}/google/protobuf/internal/containers.pyo
 ${PYSITELIB}/google/protobuf/internal/decoder.py
 ${PYSITELIB}/google/protobuf/internal/decoder.pyc
 ${PYSITELIB}/google/protobuf/internal/decoder.pyo
+${PYSITELIB}/google/protobuf/internal/descriptor_database_test.py
+${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyc
+${PYSITELIB}/google/protobuf/internal/descriptor_database_test.pyo
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.py
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyc
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test.pyo
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.py
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test1_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.py
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/descriptor_pool_test2_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/descriptor_test.py
+${PYSITELIB}/google/protobuf/internal/descriptor_test.pyc
+${PYSITELIB}/google/protobuf/internal/descriptor_test.pyo
 ${PYSITELIB}/google/protobuf/internal/encoder.py
 ${PYSITELIB}/google/protobuf/internal/encoder.pyc
 ${PYSITELIB}/google/protobuf/internal/encoder.pyo
@@ -70,24 +88,114 @@ ${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyo
 ${PYSITELIB}/google/protobuf/internal/extension_dict.py
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyc
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyo
+${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.py
+${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/factory_test1_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.py
+${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/factory_test2_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.py
+${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/file_options_test_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/generator_test.py
+${PYSITELIB}/google/protobuf/internal/generator_test.pyc
+${PYSITELIB}/google/protobuf/internal/generator_test.pyo
+${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.py
+${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyc
+${PYSITELIB}/google/protobuf/internal/import_test_package/__init__.pyo
+${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.py
+${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/import_test_package/inner_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.py
+${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/import_test_package/outer_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/json_format_test.py
+${PYSITELIB}/google/protobuf/internal/json_format_test.pyc
+${PYSITELIB}/google/protobuf/internal/json_format_test.pyo
+${PYSITELIB}/google/protobuf/internal/keywords_test.py
+${PYSITELIB}/google/protobuf/internal/keywords_test.pyc
+${PYSITELIB}/google/protobuf/internal/keywords_test.pyo
+${PYSITELIB}/google/protobuf/internal/message_factory_test.py
+${PYSITELIB}/google/protobuf/internal/message_factory_test.pyc
+${PYSITELIB}/google/protobuf/internal/message_factory_test.pyo
 ${PYSITELIB}/google/protobuf/internal/message_listener.py
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyc
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyo
+${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.py
+${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/message_set_extensions_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/message_test.py
+${PYSITELIB}/google/protobuf/internal/message_test.pyc
+${PYSITELIB}/google/protobuf/internal/message_test.pyo
+${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.py
+${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/missing_enum_values_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.py
+${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/more_extensions_dynamic_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.py
+${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/more_extensions_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/more_messages_pb2.py
+${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/more_messages_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/no_package_pb2.py
+${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/no_package_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.py
+${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/packed_field_test_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/proto_builder_test.py
+${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyc
+${PYSITELIB}/google/protobuf/internal/proto_builder_test.pyo
 ${PYSITELIB}/google/protobuf/internal/python_message.py
 ${PYSITELIB}/google/protobuf/internal/python_message.pyc
 ${PYSITELIB}/google/protobuf/internal/python_message.pyo
+${PYSITELIB}/google/protobuf/internal/reflection_test.py
+${PYSITELIB}/google/protobuf/internal/reflection_test.pyc
+${PYSITELIB}/google/protobuf/internal/reflection_test.pyo
+${PYSITELIB}/google/protobuf/internal/service_reflection_test.py
+${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyc
+${PYSITELIB}/google/protobuf/internal/service_reflection_test.pyo
+${PYSITELIB}/google/protobuf/internal/symbol_database_test.py
+${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyc
+${PYSITELIB}/google/protobuf/internal/symbol_database_test.pyo
+${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.py
+${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/test_bad_identifiers_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/test_proto3_optional_pb2.py
+${PYSITELIB}/google/protobuf/internal/test_proto3_optional_pb2.pyc
+${PYSITELIB}/google/protobuf/internal/test_proto3_optional_pb2.pyo
+${PYSITELIB}/google/protobuf/internal/test_util.py
+${PYSITELIB}/google/protobuf/internal/test_util.pyc
+${PYSITELIB}/google/protobuf/internal/test_util.pyo
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.py
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyc
 ${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyo
+${PYSITELIB}/google/protobuf/internal/text_encoding_test.py
+${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyc
+${PYSITELIB}/google/protobuf/internal/text_encoding_test.pyo
+${PYSITELIB}/google/protobuf/internal/text_format_test.py
+${PYSITELIB}/google/protobuf/internal/text_format_test.pyc
+${PYSITELIB}/google/protobuf/internal/text_format_test.pyo
 ${PYSITELIB}/google/protobuf/internal/type_checkers.py
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyc
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyo
+${PYSITELIB}/google/protobuf/internal/unknown_fields_test.py
+${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyc
+${PYSITELIB}/google/protobuf/internal/unknown_fields_test.pyo
 ${PYSITELIB}/google/protobuf/internal/well_known_types.py
 ${PYSITELIB}/google/protobuf/internal/well_known_types.pyc
 ${PYSITELIB}/google/protobuf/internal/well_known_types.pyo
+${PYSITELIB}/google/protobuf/internal/well_known_types_test.py
+${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyc
+${PYSITELIB}/google/protobuf/internal/well_known_types_test.pyo
 ${PYSITELIB}/google/protobuf/internal/wire_format.py
 ${PYSITELIB}/google/protobuf/internal/wire_format.pyc
 ${PYSITELIB}/google/protobuf/internal/wire_format.pyo
+${PYSITELIB}/google/protobuf/internal/wire_format_test.py
+${PYSITELIB}/google/protobuf/internal/wire_format_test.pyc
+${PYSITELIB}/google/protobuf/internal/wire_format_test.pyo
 ${PYSITELIB}/google/protobuf/json_format.py
 ${PYSITELIB}/google/protobuf/json_format.pyc
 ${PYSITELIB}/google/protobuf/json_format.pyo
@@ -152,6 +260,39 @@ ${PYSITELIB}/google/protobuf/timestamp_pb2.pyo
 ${PYSITELIB}/google/protobuf/type_pb2.py
 ${PYSITELIB}/google/protobuf/type_pb2.pyc
 ${PYSITELIB}/google/protobuf/type_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_arena_pb2.py
+${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_arena_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.py
+${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_custom_options_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_import_pb2.py
+${PYSITELIB}/google/protobuf/unittest_import_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_import_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_import_public_pb2.py
+${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_import_public_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_mset_pb2.py
+${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_mset_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.py
+${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_mset_wire_format_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.py
+${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_no_arena_import_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.py
+${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_no_arena_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.py
+${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_no_generic_services_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_pb2.py
+${PYSITELIB}/google/protobuf/unittest_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_pb2.pyo
+${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.py
+${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyc
+${PYSITELIB}/google/protobuf/unittest_proto3_arena_pb2.pyo
 ${PYSITELIB}/google/protobuf/util/__init__.py
 ${PYSITELIB}/google/protobuf/util/__init__.pyc
 ${PYSITELIB}/google/protobuf/util/__init__.pyo
diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo
index e208ce53359..a9623f7b467 100644
--- a/devel/py-protobuf/distinfo
+++ b/devel/py-protobuf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2020/02/06 15:57:41 adam Exp $
+$NetBSD: distinfo,v 1.26 2020/05/21 16:31:15 adam Exp $
 
-SHA1 (protobuf-3.11.3.tar.gz) = dde1dcd75652df50e9d6c9bea1a6cf6c4480c652
-RMD160 (protobuf-3.11.3.tar.gz) = f5b748266f0ac631a685c0b405c7cfb80bfd09c5
-SHA512 (protobuf-3.11.3.tar.gz) = 1e9e0d03715e8d3f5271c58139000cb512ab4cd586bfdd5ce42ff7a5971fa427285fd4ec51894a63b0435facb200088c5220677e2dd645aab6821c90476ff13c
-Size (protobuf-3.11.3.tar.gz) = 264241 bytes
+SHA1 (protobuf-python-3.12.1.tar.gz) = e191796cf26b6da159154103a57bc0f970ad509f
+RMD160 (protobuf-python-3.12.1.tar.gz) = 42e00d3f7d73f394768f54ad6fffce321d7b7c0c
+SHA512 (protobuf-python-3.12.1.tar.gz) = 8dad6e2c646ed0cb09ba27338f6b866fc78d36d79fde22b7a5b0a5d06821d6de1726a83a2a07501162901c4cfd25eb861dcd859bdb6bf26fd9f7da1b8ddc1939
+Size (protobuf-python-3.12.1.tar.gz) = 4957996 bytes