[mapbox-vector-tile] 02/03: Add patch to fix test failure with python3-protobuf.
Bas Couwenberg
sebastic at debian.org
Fri Nov 25 10:21:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapbox-vector-tile.
commit ea3b57c03c09ac02a9cabdd5d6e0b8a7d15f1c56
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Nov 25 11:09:06 2016 +0100
Add patch to fix test failure with python3-protobuf.
---
debian/changelog | 1 +
debian/patches/python3-protobuf.patch | 721 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 723 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 734a51a..bd9d3e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mapbox-vector-tile (0.5.0+ds-3) UNRELEASED; urgency=medium
* Add package for Python 3.
+ * Add patch to fix test failure with python3-protobuf.
-- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2016 10:45:26 +0100
diff --git a/debian/patches/python3-protobuf.patch b/debian/patches/python3-protobuf.patch
new file mode 100644
index 0000000..64ef893
--- /dev/null
+++ b/debian/patches/python3-protobuf.patch
@@ -0,0 +1,721 @@
+Description: Use _pb2.py suffix required for protobuf >= 3.0.0.
+ Fixes test failures:
+ .
+ ======================================================================
+ ERROR: test_decoder (unittest.loader._FailedTest)
+ ----------------------------------------------------------------------
+ ImportError: Failed to import test module: test_decoder
+ Traceback (most recent call last):
+ File "/usr/lib/python3.5/unittest/loader.py", line 428, in _find_test_path
+ module = self._get_module_from_name(name)
+ File "/usr/lib/python3.5/unittest/loader.py", line 369, in _get_module_from_name
+ __import__(name)
+ File "/build/mapbox-vector-tile-0.5.0+ds/tests/test_decoder.py", line 8, in <module>
+ import mapbox_vector_tile
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/__init__.py", line 1, in <module>
+ from . import encoder
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/encoder.py", line 15, in <module>
+ from .compat import PY3, vector_tile, apply_map
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/compat.py", line 7, in <module>
+ from .Mapbox import vector_tile_pb2_p3
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/Mapbox/vector_tile_pb2_p3.py", line 35, in <module>
+ type=None),
+ File "/usr/lib/python3/dist-packages/google/protobuf/descriptor.py", line 652, in __new__
+ _message.Message._CheckCalledFromGeneratedFile()
+ TypeError: Descriptors should not be created directly, but only retrieved from their parent.
+ .
+ .
+ ======================================================================
+ ERROR: test_encoder (unittest.loader._FailedTest)
+ ----------------------------------------------------------------------
+ ImportError: Failed to import test module: test_encoder
+ Traceback (most recent call last):
+ File "/usr/lib/python3.5/unittest/loader.py", line 428, in _find_test_path
+ module = self._get_module_from_name(name)
+ File "/usr/lib/python3.5/unittest/loader.py", line 369, in _get_module_from_name
+ __import__(name)
+ File "/build/mapbox-vector-tile-0.5.0+ds/tests/test_encoder.py", line 7, in <module>
+ import mapbox_vector_tile
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/__init__.py", line 1, in <module>
+ from . import encoder
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/encoder.py", line 15, in <module>
+ from .compat import PY3, vector_tile, apply_map
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/compat.py", line 7, in <module>
+ from .Mapbox import vector_tile_pb2_p3
+ File "/build/mapbox-vector-tile-0.5.0+ds/mapbox_vector_tile/Mapbox/vector_tile_pb2_p3.py", line 35, in <module>
+ type=None),
+ File "/usr/lib/python3/dist-packages/google/protobuf/descriptor.py", line 652, in __new__
+ _message.Message._CheckCalledFromGeneratedFile()
+ TypeError: Descriptors should not be created directly, but only retrieved from their parent.
+ .
+ See also: https://github.com/google/protobuf/blob/2fe0556c7abbe31c02147b9171397737a35bfe3b/python/google/protobuf/pyext/descriptor.cc#L94
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/tilezen/mapbox-vector-tile/pull/83
+
+--- /dev/null
++++ b/mapbox_vector_tile/Mapbox/vector_tile_p3_pb2.py
+@@ -0,0 +1,324 @@
++# Generated by the protocol buffer compiler. DO NOT EDIT!
++# source: vector_tile.proto
++
++from google.protobuf import descriptor as _descriptor
++from google.protobuf import message as _message
++from google.protobuf import reflection as _reflection
++from google.protobuf import symbol_database as _symbol_database
++from google.protobuf import descriptor_pb2
++# @@protoc_insertion_point(imports)
++
++_sym_db = _symbol_database.Default()
++
++
++
++
++DESCRIPTOR = _descriptor.FileDescriptor(
++ name='vector_tile.proto',
++ package='mapnik.vector',
++ syntax='proto2',
++ serialized_pb=b'\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\ [...]
++)
++_sym_db.RegisterFileDescriptor(DESCRIPTOR)
++
++
++
++_TILE_GEOMTYPE = _descriptor.EnumDescriptor(
++ name='GeomType',
++ full_name='mapnik.vector.tile.GeomType',
++ filename=None,
++ file=DESCRIPTOR,
++ values=[
++ _descriptor.EnumValueDescriptor(
++ name='Unknown', index=0, number=0,
++ options=None,
++ type=None),
++ _descriptor.EnumValueDescriptor(
++ name='Point', index=1, number=1,
++ options=None,
++ type=None),
++ _descriptor.EnumValueDescriptor(
++ name='LineString', index=2, number=2,
++ options=None,
++ type=None),
++ _descriptor.EnumValueDescriptor(
++ name='Polygon', index=3, number=3,
++ options=None,
++ type=None),
++ ],
++ containing_type=None,
++ options=None,
++ serialized_start=548,
++ serialized_end=611,
++)
++_sym_db.RegisterEnumDescriptor(_TILE_GEOMTYPE)
++
++
++_TILE_VALUE = _descriptor.Descriptor(
++ name='value',
++ full_name='mapnik.vector.tile.value',
++ filename=None,
++ file=DESCRIPTOR,
++ containing_type=None,
++ fields=[
++ _descriptor.FieldDescriptor(
++ name='string_value', full_name='mapnik.vector.tile.value.string_value', index=0,
++ number=1, type=9, cpp_type=9, label=1,
++ has_default_value=False, default_value=b"".decode('utf-8'),
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='float_value', full_name='mapnik.vector.tile.value.float_value', index=1,
++ number=2, type=2, cpp_type=6, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='double_value', full_name='mapnik.vector.tile.value.double_value', index=2,
++ number=3, type=1, cpp_type=5, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='int_value', full_name='mapnik.vector.tile.value.int_value', index=3,
++ number=4, type=3, cpp_type=2, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='uint_value', full_name='mapnik.vector.tile.value.uint_value', index=4,
++ number=5, type=4, cpp_type=4, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='sint_value', full_name='mapnik.vector.tile.value.sint_value', index=5,
++ number=6, type=18, cpp_type=2, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='bool_value', full_name='mapnik.vector.tile.value.bool_value', index=6,
++ number=7, type=8, cpp_type=7, label=1,
++ has_default_value=False, default_value=False,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ ],
++ extensions=[
++ ],
++ nested_types=[],
++ enum_types=[
++ ],
++ options=None,
++ is_extendable=True,
++ syntax='proto2',
++ extension_ranges=[(8, 536870912), ],
++ oneofs=[
++ ],
++ serialized_start=89,
++ serialized_end=250,
++)
++
++_TILE_FEATURE = _descriptor.Descriptor(
++ name='feature',
++ full_name='mapnik.vector.tile.feature',
++ filename=None,
++ file=DESCRIPTOR,
++ containing_type=None,
++ fields=[
++ _descriptor.FieldDescriptor(
++ name='id', full_name='mapnik.vector.tile.feature.id', index=0,
++ number=1, type=4, cpp_type=4, label=1,
++ has_default_value=False, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='tags', full_name='mapnik.vector.tile.feature.tags', index=1,
++ number=2, type=13, cpp_type=3, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
++ _descriptor.FieldDescriptor(
++ name='type', full_name='mapnik.vector.tile.feature.type', index=2,
++ number=3, type=14, cpp_type=8, label=1,
++ has_default_value=True, default_value=0,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='geometry', full_name='mapnik.vector.tile.feature.geometry', index=3,
++ number=4, type=13, cpp_type=3, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
++ ],
++ extensions=[
++ ],
++ nested_types=[],
++ enum_types=[
++ ],
++ options=None,
++ is_extendable=False,
++ syntax='proto2',
++ extension_ranges=[],
++ oneofs=[
++ ],
++ serialized_start=252,
++ serialized_end=366,
++)
++
++_TILE_LAYER = _descriptor.Descriptor(
++ name='layer',
++ full_name='mapnik.vector.tile.layer',
++ filename=None,
++ file=DESCRIPTOR,
++ containing_type=None,
++ fields=[
++ _descriptor.FieldDescriptor(
++ name='version', full_name='mapnik.vector.tile.layer.version', index=0,
++ number=15, type=13, cpp_type=3, label=2,
++ has_default_value=True, default_value=1,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='name', full_name='mapnik.vector.tile.layer.name', index=1,
++ number=1, type=9, cpp_type=9, label=2,
++ has_default_value=False, default_value=b"".decode('utf-8'),
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='features', full_name='mapnik.vector.tile.layer.features', index=2,
++ number=2, type=11, cpp_type=10, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='keys', full_name='mapnik.vector.tile.layer.keys', index=3,
++ number=3, type=9, cpp_type=9, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='values', full_name='mapnik.vector.tile.layer.values', index=4,
++ number=4, type=11, cpp_type=10, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ _descriptor.FieldDescriptor(
++ name='extent', full_name='mapnik.vector.tile.layer.extent', index=5,
++ number=5, type=13, cpp_type=3, label=1,
++ has_default_value=True, default_value=4096,
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ ],
++ extensions=[
++ ],
++ nested_types=[],
++ enum_types=[
++ ],
++ options=None,
++ is_extendable=True,
++ syntax='proto2',
++ extension_ranges=[(16, 536870912), ],
++ oneofs=[
++ ],
++ serialized_start=369,
++ serialized_end=546,
++)
++
++_TILE = _descriptor.Descriptor(
++ name='tile',
++ full_name='mapnik.vector.tile',
++ filename=None,
++ file=DESCRIPTOR,
++ containing_type=None,
++ fields=[
++ _descriptor.FieldDescriptor(
++ name='layers', full_name='mapnik.vector.tile.layers', index=0,
++ number=3, type=11, cpp_type=10, label=3,
++ has_default_value=False, default_value=[],
++ message_type=None, enum_type=None, containing_type=None,
++ is_extension=False, extension_scope=None,
++ options=None),
++ ],
++ extensions=[
++ ],
++ nested_types=[_TILE_VALUE, _TILE_FEATURE, _TILE_LAYER, ],
++ enum_types=[
++ _TILE_GEOMTYPE,
++ ],
++ options=None,
++ is_extendable=True,
++ syntax='proto2',
++ extension_ranges=[(16, 8192), ],
++ oneofs=[
++ ],
++ serialized_start=37,
++ serialized_end=618,
++)
++
++_TILE_VALUE.containing_type = _TILE
++_TILE_FEATURE.fields_by_name['type'].enum_type = _TILE_GEOMTYPE
++_TILE_FEATURE.containing_type = _TILE
++_TILE_LAYER.fields_by_name['features'].message_type = _TILE_FEATURE
++_TILE_LAYER.fields_by_name['values'].message_type = _TILE_VALUE
++_TILE_LAYER.containing_type = _TILE
++_TILE.fields_by_name['layers'].message_type = _TILE_LAYER
++_TILE_GEOMTYPE.containing_type = _TILE
++DESCRIPTOR.message_types_by_name['tile'] = _TILE
++
++tile = _reflection.GeneratedProtocolMessageType('tile', (_message.Message,), dict(
++
++ value = _reflection.GeneratedProtocolMessageType('value', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_VALUE,
++ __module__ = 'vector_tile_p3_pb2'
++ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.value)
++ ))
++ ,
++
++ feature = _reflection.GeneratedProtocolMessageType('feature', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_FEATURE,
++ __module__ = 'vector_tile_p3_pb2'
++ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.feature)
++ ))
++ ,
++
++ layer = _reflection.GeneratedProtocolMessageType('layer', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_LAYER,
++ __module__ = 'vector_tile_p3_pb2'
++ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.layer)
++ ))
++ ,
++ DESCRIPTOR = _TILE,
++ __module__ = 'vector_tile_p3_pb2'
++ # @@protoc_insertion_point(class_scope:mapnik.vector.tile)
++ ))
++_sym_db.RegisterMessage(tile)
++_sym_db.RegisterMessage(tile.value)
++_sym_db.RegisterMessage(tile.feature)
++_sym_db.RegisterMessage(tile.layer)
++
++
++DESCRIPTOR.has_options = True
++DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'H\003')
++_TILE_FEATURE.fields_by_name['tags'].has_options = True
++_TILE_FEATURE.fields_by_name['tags']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
++_TILE_FEATURE.fields_by_name['geometry'].has_options = True
++_TILE_FEATURE.fields_by_name['geometry']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
++# @@protoc_insertion_point(module_scope)
+--- a/mapbox_vector_tile/Mapbox/vector_tile_pb2_p3.py
++++ /dev/null
+@@ -1,324 +0,0 @@
+-# Generated by the protocol buffer compiler. DO NOT EDIT!
+-# source: vector_tile.proto
+-
+-from google.protobuf import descriptor as _descriptor
+-from google.protobuf import message as _message
+-from google.protobuf import reflection as _reflection
+-from google.protobuf import symbol_database as _symbol_database
+-from google.protobuf import descriptor_pb2
+-# @@protoc_insertion_point(imports)
+-
+-_sym_db = _symbol_database.Default()
+-
+-
+-
+-
+-DESCRIPTOR = _descriptor.FileDescriptor(
+- name='vector_tile.proto',
+- package='mapnik.vector',
+- syntax='proto2',
+- serialized_pb=b'\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\ [...]
+-)
+-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+-
+-
+-
+-_TILE_GEOMTYPE = _descriptor.EnumDescriptor(
+- name='GeomType',
+- full_name='mapnik.vector.tile.GeomType',
+- filename=None,
+- file=DESCRIPTOR,
+- values=[
+- _descriptor.EnumValueDescriptor(
+- name='Unknown', index=0, number=0,
+- options=None,
+- type=None),
+- _descriptor.EnumValueDescriptor(
+- name='Point', index=1, number=1,
+- options=None,
+- type=None),
+- _descriptor.EnumValueDescriptor(
+- name='LineString', index=2, number=2,
+- options=None,
+- type=None),
+- _descriptor.EnumValueDescriptor(
+- name='Polygon', index=3, number=3,
+- options=None,
+- type=None),
+- ],
+- containing_type=None,
+- options=None,
+- serialized_start=548,
+- serialized_end=611,
+-)
+-_sym_db.RegisterEnumDescriptor(_TILE_GEOMTYPE)
+-
+-
+-_TILE_VALUE = _descriptor.Descriptor(
+- name='value',
+- full_name='mapnik.vector.tile.value',
+- filename=None,
+- file=DESCRIPTOR,
+- containing_type=None,
+- fields=[
+- _descriptor.FieldDescriptor(
+- name='string_value', full_name='mapnik.vector.tile.value.string_value', index=0,
+- number=1, type=9, cpp_type=9, label=1,
+- has_default_value=False, default_value=b"".decode('utf-8'),
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='float_value', full_name='mapnik.vector.tile.value.float_value', index=1,
+- number=2, type=2, cpp_type=6, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='double_value', full_name='mapnik.vector.tile.value.double_value', index=2,
+- number=3, type=1, cpp_type=5, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='int_value', full_name='mapnik.vector.tile.value.int_value', index=3,
+- number=4, type=3, cpp_type=2, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='uint_value', full_name='mapnik.vector.tile.value.uint_value', index=4,
+- number=5, type=4, cpp_type=4, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='sint_value', full_name='mapnik.vector.tile.value.sint_value', index=5,
+- number=6, type=18, cpp_type=2, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='bool_value', full_name='mapnik.vector.tile.value.bool_value', index=6,
+- number=7, type=8, cpp_type=7, label=1,
+- has_default_value=False, default_value=False,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- ],
+- extensions=[
+- ],
+- nested_types=[],
+- enum_types=[
+- ],
+- options=None,
+- is_extendable=True,
+- syntax='proto2',
+- extension_ranges=[(8, 536870912), ],
+- oneofs=[
+- ],
+- serialized_start=89,
+- serialized_end=250,
+-)
+-
+-_TILE_FEATURE = _descriptor.Descriptor(
+- name='feature',
+- full_name='mapnik.vector.tile.feature',
+- filename=None,
+- file=DESCRIPTOR,
+- containing_type=None,
+- fields=[
+- _descriptor.FieldDescriptor(
+- name='id', full_name='mapnik.vector.tile.feature.id', index=0,
+- number=1, type=4, cpp_type=4, label=1,
+- has_default_value=False, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='tags', full_name='mapnik.vector.tile.feature.tags', index=1,
+- number=2, type=13, cpp_type=3, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
+- _descriptor.FieldDescriptor(
+- name='type', full_name='mapnik.vector.tile.feature.type', index=2,
+- number=3, type=14, cpp_type=8, label=1,
+- has_default_value=True, default_value=0,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='geometry', full_name='mapnik.vector.tile.feature.geometry', index=3,
+- number=4, type=13, cpp_type=3, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
+- ],
+- extensions=[
+- ],
+- nested_types=[],
+- enum_types=[
+- ],
+- options=None,
+- is_extendable=False,
+- syntax='proto2',
+- extension_ranges=[],
+- oneofs=[
+- ],
+- serialized_start=252,
+- serialized_end=366,
+-)
+-
+-_TILE_LAYER = _descriptor.Descriptor(
+- name='layer',
+- full_name='mapnik.vector.tile.layer',
+- filename=None,
+- file=DESCRIPTOR,
+- containing_type=None,
+- fields=[
+- _descriptor.FieldDescriptor(
+- name='version', full_name='mapnik.vector.tile.layer.version', index=0,
+- number=15, type=13, cpp_type=3, label=2,
+- has_default_value=True, default_value=1,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='name', full_name='mapnik.vector.tile.layer.name', index=1,
+- number=1, type=9, cpp_type=9, label=2,
+- has_default_value=False, default_value=b"".decode('utf-8'),
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='features', full_name='mapnik.vector.tile.layer.features', index=2,
+- number=2, type=11, cpp_type=10, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='keys', full_name='mapnik.vector.tile.layer.keys', index=3,
+- number=3, type=9, cpp_type=9, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='values', full_name='mapnik.vector.tile.layer.values', index=4,
+- number=4, type=11, cpp_type=10, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- _descriptor.FieldDescriptor(
+- name='extent', full_name='mapnik.vector.tile.layer.extent', index=5,
+- number=5, type=13, cpp_type=3, label=1,
+- has_default_value=True, default_value=4096,
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- ],
+- extensions=[
+- ],
+- nested_types=[],
+- enum_types=[
+- ],
+- options=None,
+- is_extendable=True,
+- syntax='proto2',
+- extension_ranges=[(16, 536870912), ],
+- oneofs=[
+- ],
+- serialized_start=369,
+- serialized_end=546,
+-)
+-
+-_TILE = _descriptor.Descriptor(
+- name='tile',
+- full_name='mapnik.vector.tile',
+- filename=None,
+- file=DESCRIPTOR,
+- containing_type=None,
+- fields=[
+- _descriptor.FieldDescriptor(
+- name='layers', full_name='mapnik.vector.tile.layers', index=0,
+- number=3, type=11, cpp_type=10, label=3,
+- has_default_value=False, default_value=[],
+- message_type=None, enum_type=None, containing_type=None,
+- is_extension=False, extension_scope=None,
+- options=None),
+- ],
+- extensions=[
+- ],
+- nested_types=[_TILE_VALUE, _TILE_FEATURE, _TILE_LAYER, ],
+- enum_types=[
+- _TILE_GEOMTYPE,
+- ],
+- options=None,
+- is_extendable=True,
+- syntax='proto2',
+- extension_ranges=[(16, 8192), ],
+- oneofs=[
+- ],
+- serialized_start=37,
+- serialized_end=618,
+-)
+-
+-_TILE_VALUE.containing_type = _TILE
+-_TILE_FEATURE.fields_by_name['type'].enum_type = _TILE_GEOMTYPE
+-_TILE_FEATURE.containing_type = _TILE
+-_TILE_LAYER.fields_by_name['features'].message_type = _TILE_FEATURE
+-_TILE_LAYER.fields_by_name['values'].message_type = _TILE_VALUE
+-_TILE_LAYER.containing_type = _TILE
+-_TILE.fields_by_name['layers'].message_type = _TILE_LAYER
+-_TILE_GEOMTYPE.containing_type = _TILE
+-DESCRIPTOR.message_types_by_name['tile'] = _TILE
+-
+-tile = _reflection.GeneratedProtocolMessageType('tile', (_message.Message,), dict(
+-
+- value = _reflection.GeneratedProtocolMessageType('value', (_message.Message,), dict(
+- DESCRIPTOR = _TILE_VALUE,
+- __module__ = 'vector_tile_pb2_p3'
+- # @@protoc_insertion_point(class_scope:mapnik.vector.tile.value)
+- ))
+- ,
+-
+- feature = _reflection.GeneratedProtocolMessageType('feature', (_message.Message,), dict(
+- DESCRIPTOR = _TILE_FEATURE,
+- __module__ = 'vector_tile_pb2_p3'
+- # @@protoc_insertion_point(class_scope:mapnik.vector.tile.feature)
+- ))
+- ,
+-
+- layer = _reflection.GeneratedProtocolMessageType('layer', (_message.Message,), dict(
+- DESCRIPTOR = _TILE_LAYER,
+- __module__ = 'vector_tile_pb2_p3'
+- # @@protoc_insertion_point(class_scope:mapnik.vector.tile.layer)
+- ))
+- ,
+- DESCRIPTOR = _TILE,
+- __module__ = 'vector_tile_pb2_p3'
+- # @@protoc_insertion_point(class_scope:mapnik.vector.tile)
+- ))
+-_sym_db.RegisterMessage(tile)
+-_sym_db.RegisterMessage(tile.value)
+-_sym_db.RegisterMessage(tile.feature)
+-_sym_db.RegisterMessage(tile.layer)
+-
+-
+-DESCRIPTOR.has_options = True
+-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'H\003')
+-_TILE_FEATURE.fields_by_name['tags'].has_options = True
+-_TILE_FEATURE.fields_by_name['tags']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
+-_TILE_FEATURE.fields_by_name['geometry'].has_options = True
+-_TILE_FEATURE.fields_by_name['geometry']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
+-# @@protoc_insertion_point(module_scope)
+--- a/mapbox_vector_tile/compat.py
++++ b/mapbox_vector_tile/compat.py
+@@ -4,8 +4,8 @@ from builtins import map
+ PY3 = sys.version_info[0] == 3
+
+ if PY3:
+- from .Mapbox import vector_tile_pb2_p3
+- vector_tile = vector_tile_pb2_p3
++ from .Mapbox import vector_tile_p3_pb2
++ vector_tile = vector_tile_p3_pb2
+ else:
+ from .Mapbox import vector_tile_pb2
+ vector_tile = vector_tile_pb2
diff --git a/debian/patches/series b/debian/patches/series
index f03fc88..f0c41e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
missing-files.patch
+python3-protobuf.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapbox-vector-tile.git
More information about the Pkg-grass-devel
mailing list