Use gfmetadata import instead

diff --git a/Lib/axisregistry/__init__.py b/Lib/axisregistry/__init__.py
index ef4df21bdb096bf41bebc4fadffb34bd346b2a54..455cffd7e7a0f20eb41f239325eea32b7e728b7d 100644 (file)
--- a/Lib/axisregistry/__init__.py
+++ b/Lib/axisregistry/__init__.py
@@ -6,7 +6,7 @@ from fontTools.varLib.instancer.names import _updateUniqueIdNameRecord, NameID
 from fontTools.ttLib.tables._f_v_a_r import NamedInstance
 from google.protobuf import text_format
 from collections import OrderedDict
-from axisregistry.axes_pb2 import AxisProto
+from gfmetadata import AxisProto
 from collections import defaultdict
 from itertools import chain
 import logging

diff --git a/Lib/axisregistry/axes.proto b/Lib/axisregistry/axes.proto
deleted file mode 100644 (file)
index ccc93f4..0000000
--- a/Lib/axisregistry/axes.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-syntax = "proto2";
-// GF Axis Registry Protos
-
-// An axis in the GF Axis Registry
-message AxisProto {
-  // Axis tag
-  optional string tag = 1;
-
-  // Display name for axis, e.g. "Optical size" for 'opsz'
-  // Like 'Name' in
-  // https://docs.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_opsz
-  optional string display_name = 7;
-
-  // Lower bound for the axis
-  optional float min_value = 2;
-
-  // The default position to use and to prefer for exemplars
-  optional float default_value = 3;
-
-  // Upper bound for the axis
-  optional float max_value = 4;
-
-  // Input values for this axis must aligned to 10^precision
-  optional int32 precision = 5;
-
-  // Fallback positions along the axis
-  repeated FallbackProto fallback = 6;
-
-  // Short descriptive paragraph
-  optional string description = 8;
-
-  // Whether only the fallback positions should be used, for example, an axis
-  // might have only three relevant positions: the min, the middle, and the max.
-  optional bool fallback_only = 9;
-
-  // The thumbnail image for this axis, if any.
-  optional string illustration_url = 10;
-
-  // Next = 11
-}
-
-message FallbackProto {
-  optional string name = 1;
-  optional float value = 2;
-  optional string display_name = 3;
-}

diff --git a/Lib/axisregistry/axes_pb2.py b/Lib/axisregistry/axes_pb2.py
deleted file mode 100644 (file)
index 3eb6402..0000000
--- a/Lib/axisregistry/axes_pb2.py
+++ /dev/null
@@ -1,343 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: axes.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
-
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-    name="axes.proto",
-    package="",
-    syntax="proto2",
-    serialized_options=None,
-    create_key=_descriptor._internal_create_key,
-    serialized_pb=b'\n\naxes.proto"\xe6\x01\n\tAxisProto\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x07 \x01(\t\x12\x11\n\tmin_value\x18\x02 \x01(\x02\x12\x15\n\rdefault_value\x18\x03 \x01(\x02\x12\x11\n\tmax_value\x18\x04 \x01(\x02\x12\x11\n\tprecision\x18\x05 \x01(\x05\x12 \n\x08\x66\x61llback\x18\x06 \x03(\x0b\x32\x0e.FallbackProto\x12\x13\n\x0b\x64\x65scription\x18\x08 \x01(\t\x12\x15\n\rfallback_only\x18\t \x01(\x08\x12\x18\n\x10illustration_url\x18\n \x01(\t"B\n\rFallbackProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64isplay_name\x18\x03 \x01(\t',
-)
-
-
-_AXISPROTO = _descriptor.Descriptor(
-    name="AxisProto",
-    full_name="AxisProto",
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    create_key=_descriptor._internal_create_key,
-    fields=[
-        _descriptor.FieldDescriptor(
-            name="tag",
-            full_name="AxisProto.tag",
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="display_name",
-            full_name="AxisProto.display_name",
-            index=1,
-            number=7,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="min_value",
-            full_name="AxisProto.min_value",
-            index=2,
-            number=2,
-            type=2,
-            cpp_type=6,
-            label=1,
-            has_default_value=False,
-            default_value=float(0),
-            message_type=None,
-            enum_type=None,
-            containing_type=None,
-            is_extension=False,
-            extension_scope=None,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="default_value",
-            full_name="AxisProto.default_value",
-            index=3,
-            number=3,
-            type=2,
-            cpp_type=6,
-            label=1,
-            has_default_value=False,
-            default_value=float(0),
-            message_type=None,
-            enum_type=None,
-            containing_type=None,
-            is_extension=False,
-            extension_scope=None,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="max_value",
-            full_name="AxisProto.max_value",
-            index=4,
-            number=4,
-            type=2,
-            cpp_type=6,
-            label=1,
-            has_default_value=False,
-            default_value=float(0),
-            message_type=None,
-            enum_type=None,
-            containing_type=None,
-            is_extension=False,
-            extension_scope=None,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="precision",
-            full_name="AxisProto.precision",
-            index=5,
-            number=5,
-            type=5,
-            cpp_type=1,
-            label=1,
-            has_default_value=False,
-            default_value=0,
-            message_type=None,
-            enum_type=None,
-            containing_type=None,
-            is_extension=False,
-            extension_scope=None,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="fallback",
-            full_name="AxisProto.fallback",
-            index=6,
-            number=6,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="description",
-            full_name="AxisProto.description",
-            index=7,
-            number=8,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="fallback_only",
-            full_name="AxisProto.fallback_only",
-            index=8,
-            number=9,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="illustration_url",
-            full_name="AxisProto.illustration_url",
-            index=9,
-            number=10,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-    ],
-    extensions=[],
-    nested_types=[],
-    enum_types=[],
-    serialized_options=None,
-    is_extendable=False,
-    syntax="proto2",
-    extension_ranges=[],
-    oneofs=[],
-    serialized_start=15,
-    serialized_end=245,
-)
-
-
-_FALLBACKPROTO = _descriptor.Descriptor(
-    name="FallbackProto",
-    full_name="FallbackProto",
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    create_key=_descriptor._internal_create_key,
-    fields=[
-        _descriptor.FieldDescriptor(
-            name="name",
-            full_name="FallbackProto.name",
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="value",
-            full_name="FallbackProto.value",
-            index=1,
-            number=2,
-            type=2,
-            cpp_type=6,
-            label=1,
-            has_default_value=False,
-            default_value=float(0),
-            message_type=None,
-            enum_type=None,
-            containing_type=None,
-            is_extension=False,
-            extension_scope=None,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-        _descriptor.FieldDescriptor(
-            name="display_name",
-            full_name="FallbackProto.display_name",
-            index=2,
-            number=3,
-            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,
-            serialized_options=None,
-            file=DESCRIPTOR,
-            create_key=_descriptor._internal_create_key,
-        ),
-    ],
-    extensions=[],
-    nested_types=[],
-    enum_types=[],
-    serialized_options=None,
-    is_extendable=False,
-    syntax="proto2",
-    extension_ranges=[],
-    oneofs=[],
-    serialized_start=247,
-    serialized_end=313,
-)
-
-_AXISPROTO.fields_by_name["fallback"].message_type = _FALLBACKPROTO
-DESCRIPTOR.message_types_by_name["AxisProto"] = _AXISPROTO
-DESCRIPTOR.message_types_by_name["FallbackProto"] = _FALLBACKPROTO
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-AxisProto = _reflection.GeneratedProtocolMessageType(
-    "AxisProto",
-    (_message.Message,),
-    {
-        "DESCRIPTOR": _AXISPROTO,
-        "__module__": "axes_pb2"
-        # @@protoc_insertion_point(class_scope:AxisProto)
-    },
-)
-_sym_db.RegisterMessage(AxisProto)
-
-FallbackProto = _reflection.GeneratedProtocolMessageType(
-    "FallbackProto",
-    (_message.Message,),
-    {
-        "DESCRIPTOR": _FALLBACKPROTO,
-        "__module__": "axes_pb2"
-        # @@protoc_insertion_point(class_scope:FallbackProto)
-    },
-)
-_sym_db.RegisterMessage(FallbackProto)
-
-
-# @@protoc_insertion_point(module_scope)