Theo Buehler (2021-03-11 17:50 +0100): > Keep py-protobuf in sync with protobuf. Lightly tested on amd64.
Works for me. OK. > I was wondering if we could switch it to py3 only. The only potential > py2 consumer is security/py-axolotol, as far as I can see. > > feinerer, would you be ok with switching py-axolotl to py3 only? > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/py-protobuf/Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 Makefile > --- Makefile 8 Sep 2020 06:30:48 -0000 1.7 > +++ Makefile 7 Mar 2021 11:58:53 -0000 > @@ -2,7 +2,7 @@ > > COMMENT= Google data interchange format (protocol buffers) > > -MODPY_EGG_VERSION= 3.13.0 > +MODPY_EGG_VERSION= 3.15.5 > DISTNAME= protobuf-${MODPY_EGG_VERSION} > PKGNAME= py-${DISTNAME} > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/py-protobuf/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- distinfo 8 Sep 2020 06:30:48 -0000 1.4 > +++ distinfo 7 Mar 2021 11:58:58 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (protobuf-3.13.0.tar.gz) = > aoLgyLsr9Y9gYEDMWBTgdxWyCUyuuigeLn0LDi45fbU= > -SIZE (protobuf-3.13.0.tar.gz) = 267858 > +SHA256 (protobuf-3.15.5.tar.gz) = > voqSnGF4u2y+niyFi+YvoIlmo5rnWKhJOojw7R77YJc= > +SIZE (protobuf-3.15.5.tar.gz) = 228798 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/py-protobuf/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pkg/PLIST 15 Sep 2019 13:25:36 -0000 1.2 > +++ pkg/PLIST 7 Mar 2021 11:59:43 -0000 > @@ -5,7 +5,6 @@ lib/python${MODPY_VERSION}/site-packages > > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}/ > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}any_pb2.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}any_test_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}api_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}descriptor.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}descriptor_database.${MODPY_PYC_MAGIC_TAG}pyc > @@ -15,8 +14,6 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}empty_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}field_mask_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}json_format.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}map_proto2_unittest_pb2.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}map_unittest_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}message_factory.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}proto_builder.${MODPY_PYC_MAGIC_TAG}pyc > @@ -26,15 +23,12 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}source_context_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}struct_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}symbol_database.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}test_messages_proto2_pb2.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}test_messages_proto3_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}text_encoding.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}text_format.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}timestamp_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}type_pb2.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/${MODPY_PYCACHE}wrappers_pb2.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/google/protobuf/any_pb2.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/any_test_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/api_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/compiler/ > lib/python${MODPY_VERSION}/site-packages/google/protobuf/compiler/__init__.py > @@ -53,7 +47,6 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/__init__.py > > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}/ > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}_parameterized.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}api_implementation.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}containers.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc > @@ -62,11 +55,9 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}extension_dict.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}message_listener.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}python_message.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}testing_refleaks.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}type_checkers.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}well_known_types.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/${MODPY_PYCACHE}wire_format.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/_parameterized.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/api_implementation.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/containers.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/decoder.py > @@ -75,13 +66,10 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/extension_dict.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/message_listener.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/python_message.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/testing_refleaks.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/type_checkers.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/well_known_types.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/internal/wire_format.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/json_format.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/map_proto2_unittest_pb2.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/map_unittest_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/message.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/message_factory.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/proto_builder.py > @@ -90,17 +78,13 @@ lib/python${MODPY_VERSION}/site-packages > > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/${MODPY_PYCACHE}/ > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/${MODPY_PYCACHE}cpp_message.${MODPY_PYC_MAGIC_TAG}pyc > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/${MODPY_PYCACHE}python_pb2.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/cpp_message.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/pyext/python_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/reflection.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/service.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/service_reflection.py > > lib/python${MODPY_VERSION}/site-packages/google/protobuf/source_context_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/struct_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/symbol_database.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/test_messages_proto2_pb2.py > -lib/python${MODPY_VERSION}/site-packages/google/protobuf/test_messages_proto3_pb2.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/text_encoding.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/text_format.py > lib/python${MODPY_VERSION}/site-packages/google/protobuf/timestamp_pb2.py