jprdonnelly/fonts
1
0
Fork 0
mirror of synced 2025-12-19 17:48:10 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39 from googlefonts/tox

Browse Source 
Tox: use black
This commit is contained in:
Marc Foley
2022-05-06 15:45:36 +01:00
committed by GitHub
parent ed29279d80 81aa9727aa
commit 948129a48e
5 changed files with 381 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/axisregistry/__init__.py
View File

@@ -22,7 +22,8 @@ def AxisRegistry():
axis = get_Protobuf_Message(AxisProto, path) axis = get_Protobuf_Message(AxisProto, path)
registry[axis.tag] = axis # pylint: disable=E1101 registry[axis.tag] = axis # pylint: disable=E1101
for axis in ["casual.textproto", for axis in [
"casual.textproto",
"cursive.textproto", "cursive.textproto",
"fill.textproto", "fill.textproto",
"flair.textproto", "flair.textproto",
@@ -44,7 +45,8 @@ def AxisRegistry():
"y_transparent_descender.textproto", "y_transparent_descender.textproto",
"y_transparent_figures.textproto", "y_transparent_figures.textproto",
"y_transparent_lowercase.textproto", "y_transparent_lowercase.textproto",
"y_transparent_uppercase.textproto"]: "y_transparent_uppercase.textproto",
append_AxisMessage(resource_filename('axisregistry', 'data/' + axis)) ]:
append_AxisMessage(resource_filename("axisregistry", "data/" + axis))
return registry return registry

385
Lib/axisregistry/axes_pb2.py
View File

@@ -6,182 +6,337 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message from google.protobuf import message as _message
from google.protobuf import reflection as _reflection from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database from google.protobuf import symbol_database as _symbol_database
# @@protoc_insertion_point(imports) # @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default() _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor.FileDescriptor( DESCRIPTOR = _descriptor.FileDescriptor(
name='axes.proto', name="axes.proto",
package='', package="",
syntax='proto2', syntax="proto2",
serialized_options=None, serialized_options=None,
create_key=_descriptor._internal_create_key, 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' 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( _AXISPROTO = _descriptor.Descriptor(
name='AxisProto', name="AxisProto",
full_name='AxisProto', full_name="AxisProto",
filename=None, filename=None,
file=DESCRIPTOR, file=DESCRIPTOR,
containing_type=None, containing_type=None,
create_key=_descriptor._internal_create_key, create_key=_descriptor._internal_create_key,
fields=[ fields=[
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='tag', full_name='AxisProto.tag', index=0, name="tag",
number=1, type=9, cpp_type=9, label=1, full_name="AxisProto.tag",
has_default_value=False, default_value=b"".decode('utf-8'), index=0,
message_type=None, enum_type=None, containing_type=None, number=1,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='display_name', full_name='AxisProto.display_name', index=1, name="display_name",
number=7, type=9, cpp_type=9, label=1, full_name="AxisProto.display_name",
has_default_value=False, default_value=b"".decode('utf-8'), index=1,
message_type=None, enum_type=None, containing_type=None, number=7,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='min_value', full_name='AxisProto.min_value', index=2, name="min_value",
number=2, type=2, cpp_type=6, label=1, full_name="AxisProto.min_value",
has_default_value=False, default_value=float(0), index=2,
message_type=None, enum_type=None, containing_type=None, number=2,
is_extension=False, extension_scope=None, type=2,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='default_value', full_name='AxisProto.default_value', index=3, name="default_value",
number=3, type=2, cpp_type=6, label=1, full_name="AxisProto.default_value",
has_default_value=False, default_value=float(0), index=3,
message_type=None, enum_type=None, containing_type=None, number=3,
is_extension=False, extension_scope=None, type=2,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='max_value', full_name='AxisProto.max_value', index=4, name="max_value",
number=4, type=2, cpp_type=6, label=1, full_name="AxisProto.max_value",
has_default_value=False, default_value=float(0), index=4,
message_type=None, enum_type=None, containing_type=None, number=4,
is_extension=False, extension_scope=None, type=2,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='precision', full_name='AxisProto.precision', index=5, name="precision",
number=5, type=5, cpp_type=1, label=1, full_name="AxisProto.precision",
has_default_value=False, default_value=0, index=5,
message_type=None, enum_type=None, containing_type=None, number=5,
is_extension=False, extension_scope=None, type=5,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='fallback', full_name='AxisProto.fallback', index=6, name="fallback",
number=6, type=11, cpp_type=10, label=3, full_name="AxisProto.fallback",
has_default_value=False, default_value=[], index=6,
message_type=None, enum_type=None, containing_type=None, number=6,
is_extension=False, extension_scope=None, type=11,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='description', full_name='AxisProto.description', index=7, name="description",
number=8, type=9, cpp_type=9, label=1, full_name="AxisProto.description",
has_default_value=False, default_value=b"".decode('utf-8'), index=7,
message_type=None, enum_type=None, containing_type=None, number=8,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='fallback_only', full_name='AxisProto.fallback_only', index=8, name="fallback_only",
number=9, type=8, cpp_type=7, label=1, full_name="AxisProto.fallback_only",
has_default_value=False, default_value=False, index=8,
message_type=None, enum_type=None, containing_type=None, number=9,
is_extension=False, extension_scope=None, type=8,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='illustration_url', full_name='AxisProto.illustration_url', index=9, name="illustration_url",
number=10, type=9, cpp_type=9, label=1, full_name="AxisProto.illustration_url",
has_default_value=False, default_value=b"".decode('utf-8'), index=9,
message_type=None, enum_type=None, containing_type=None, number=10,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), cpp_type=9,
], label=1,
extensions=[ 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=[], nested_types=[],
enum_types=[ enum_types=[],
],
serialized_options=None, serialized_options=None,
is_extendable=False, is_extendable=False,
syntax='proto2', syntax="proto2",
extension_ranges=[], extension_ranges=[],
oneofs=[ oneofs=[],
],
serialized_start=15, serialized_start=15,
serialized_end=245, serialized_end=245,
) )
_FALLBACKPROTO = _descriptor.Descriptor( _FALLBACKPROTO = _descriptor.Descriptor(
name='FallbackProto', name="FallbackProto",
full_name='FallbackProto', full_name="FallbackProto",
filename=None, filename=None,
file=DESCRIPTOR, file=DESCRIPTOR,
containing_type=None, containing_type=None,
create_key=_descriptor._internal_create_key, create_key=_descriptor._internal_create_key,
fields=[ fields=[
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='name', full_name='FallbackProto.name', index=0, name="name",
number=1, type=9, cpp_type=9, label=1, full_name="FallbackProto.name",
has_default_value=False, default_value=b"".decode('utf-8'), index=0,
message_type=None, enum_type=None, containing_type=None, number=1,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='value', full_name='FallbackProto.value', index=1, name="value",
number=2, type=2, cpp_type=6, label=1, full_name="FallbackProto.value",
has_default_value=False, default_value=float(0), index=1,
message_type=None, enum_type=None, containing_type=None, number=2,
is_extension=False, extension_scope=None, type=2,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), 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( _descriptor.FieldDescriptor(
name='display_name', full_name='FallbackProto.display_name', index=2, name="display_name",
number=3, type=9, cpp_type=9, label=1, full_name="FallbackProto.display_name",
has_default_value=False, default_value=b"".decode('utf-8'), index=2,
message_type=None, enum_type=None, containing_type=None, number=3,
is_extension=False, extension_scope=None, type=9,
serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), cpp_type=9,
], label=1,
extensions=[ 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=[], nested_types=[],
enum_types=[ enum_types=[],
],
serialized_options=None, serialized_options=None,
is_extendable=False, is_extendable=False,
syntax='proto2', syntax="proto2",
extension_ranges=[], extension_ranges=[],
oneofs=[ oneofs=[],
],
serialized_start=247, serialized_start=247,
serialized_end=313, serialized_end=313,
) )
_AXISPROTO.fields_by_name['fallback'].message_type = _FALLBACKPROTO _AXISPROTO.fields_by_name["fallback"].message_type = _FALLBACKPROTO
DESCRIPTOR.message_types_by_name['AxisProto'] = _AXISPROTO DESCRIPTOR.message_types_by_name["AxisProto"] = _AXISPROTO
DESCRIPTOR.message_types_by_name['FallbackProto'] = _FALLBACKPROTO DESCRIPTOR.message_types_by_name["FallbackProto"] = _FALLBACKPROTO
_sym_db.RegisterFileDescriptor(DESCRIPTOR) _sym_db.RegisterFileDescriptor(DESCRIPTOR)
AxisProto = _reflection.GeneratedProtocolMessageType('AxisProto', (_message.Message,), { AxisProto = _reflection.GeneratedProtocolMessageType(
'DESCRIPTOR' : _AXISPROTO, "AxisProto",
'__module__' : 'axes_pb2' (_message.Message,),
{
"DESCRIPTOR": _AXISPROTO,
"__module__": "axes_pb2"
# @@protoc_insertion_point(class_scope:AxisProto) # @@protoc_insertion_point(class_scope:AxisProto)
}) },
)
_sym_db.RegisterMessage(AxisProto) _sym_db.RegisterMessage(AxisProto)
FallbackProto = _reflection.GeneratedProtocolMessageType('FallbackProto', (_message.Message,), { FallbackProto = _reflection.GeneratedProtocolMessageType(
'DESCRIPTOR' : _FALLBACKPROTO, "FallbackProto",
'__module__' : 'axes_pb2' (_message.Message,),
{
"DESCRIPTOR": _FALLBACKPROTO,
"__module__": "axes_pb2"
# @@protoc_insertion_point(class_scope:FallbackProto) # @@protoc_insertion_point(class_scope:FallbackProto)
}) },
)
_sym_db.RegisterMessage(FallbackProto) _sym_db.RegisterMessage(FallbackProto)

37
setup.py
View File

@@ -18,35 +18,30 @@
from setuptools import setup from setuptools import setup
# Read the contents of the README file # Read the contents of the README file
with open('README.md') as f: with open("README.md") as f:
long_description = f.read() long_description = f.read()
setup( setup(
name="axisregistry", name="axisregistry",
use_scm_version={"write_to": "Lib/axisregistry/_version.py"}, use_scm_version={"write_to": "Lib/axisregistry/_version.py"},
url='https://github.com/googlefonts/axisregistry/', url="https://github.com/googlefonts/axisregistry/",
description='A python API to access data from the Google Fonts variable fonts axis registry.', description="A python API to access data from the Google Fonts variable fonts axis registry.",
long_description=long_description, long_description=long_description,
long_description_content_type='text/markdown', # This is important! long_description_content_type="text/markdown", # This is important!
author=('Felipe Sanches'), author=("Felipe Sanches"),
author_email='juca@members.fsf.org', author_email="juca@members.fsf.org",
package_dir={'': 'Lib'}, package_dir={"": "Lib"},
packages=['axisregistry'], packages=["axisregistry"],
package_data={'axisregistry': [ package_data={"axisregistry": ["data/*.textproto"]},
"data/*.textproto"
]
},
zip_safe=False, zip_safe=False,
classifiers=[ classifiers=[
'Intended Audience :: Developers', "Intended Audience :: Developers",
'Topic :: Text Processing :: Fonts', "Topic :: Text Processing :: Fonts",
'License :: OSI Approved :: Apache Software License', "License :: OSI Approved :: Apache Software License",
'Operating System :: OS Independent', "Operating System :: OS Independent",
'Programming Language :: Python :: 3' "Programming Language :: Python :: 3",
], ],
python_requires=">=3.7", python_requires=">=3.7",
setup_requires=['setuptools_scm>=4,<6.1'], setup_requires=["setuptools_scm>=4,<6.1"],
install_requires=[ install_requires=["protobuf"],
'protobuf'
]
) )

4
tests/test_axisregistry_api.py
View File

@@ -3,7 +3,7 @@ from axisregistry import AxisRegistry
def test_AxisRegistry(): def test_AxisRegistry():
registry = AxisRegistry() registry = AxisRegistry()
assert 'GRAD' in registry.keys() assert "GRAD" in registry.keys()
for axis_tag in registry.keys(): for axis_tag in registry.keys():
assert len(axis_tag) == 4 assert len(axis_tag) == 4
for f in range(len(registry[axis_tag].fallback)): for f in range(len(registry[axis_tag].fallback)):
@@ -11,4 +11,4 @@ def test_AxisRegistry():
# fallback names should not be space-separated. # fallback names should not be space-separated.
# (see: https://github.com/googlefonts/axisregistry/issues/7) # (see: https://github.com/googlefonts/axisregistry/issues/7)
assert ' ' not in fallback.name assert " " not in fallback.name

65
tox.ini
View File

@@ -1,53 +1,38 @@
[tox] [tox]
envlist = py37, py38, py39, coverage, flake8, pylint envlist = lint, py3{7,8,9}, pypy3, coverage-report
skip_missing_interpreters = true
[gh-actions]
python =
3.7: py37, coverage, flake8, pylint
3.8: py38, coverage, flake8, pylint
3.9: py39, coverage, flake8, pylint
[testenv] [testenv]
deps = deps =
pytest
coverage
-r requirements.txt -r requirements.txt
commands = coverage run -m pytest {posargs} -r test_requirements.txt
; download the latest pip, setuptools and wheel when creating the venv
download = true
commands =
coverage run --parallel-mode -m pytest {posargs}
[testenv:coverage] [testenv:lint]
deps = coverage skip_install = true
deps =
-r test_requirements.txt
commands =
black --check --diff .
isort --check-only --diff .
flake8
[testenv:coverage-report]
skip_install = true skip_install = true
commands = commands =
coverage combine
coverage xml
coverage report coverage report
coverage html coverage html
[testenv:flake8]
deps =
flake8
commands = flake8 --count --show-source --statistics
[testenv:pylint]
deps =
pylint
wont_fix = invalid-name,protected-access,too-many-lines
maybe_someday = fixme,missing-docstring,line-too-long
commands = pylint --disable={[testenv:pylint]wont_fix},{[testenv:pylint]maybe_someday} --ignore=axes_pb2.py Lib/axisregistry
[flake8] [flake8]
select = E,F,W select = C, E, F, W, B, B9
ignore = E203, E266, E501, W503
max-line-length = 88
exclude = .git, __pycache__, build, dist, .eggs, .tox, venv, venv*, .venv, .venv*
exclude = [isort]
# Exclude the entire build directory: profile = black
build
# Exclude these auto-generated files that should not be hand-edited:
Lib/axisregistry/*_pb2.py,
# No need to traverse hidden directories such as .git, .tox
.*,
# Exclude virtual environment directory:
venv*,
# There's no value in checking cache directories
__pycache__,
max-line-length=100
ignore =
E126, # continuation line over-indented for hanging indent