Skip to content

Commit

Permalink
fix: regenerate and don't format protos (#110)
Browse files Browse the repository at this point in the history
* fix: regenerate and don't format protos

I also updated the OwlBot config to regenerate the protos to make sure
they always stay consistent.

* Also fix nox lint session
  • Loading branch information
tbpg authored May 26, 2022
1 parent 993badb commit a61801a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 56 deletions.
26 changes: 16 additions & 10 deletions docuploader/protos/metadata_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 6 additions & 42 deletions docuploader/protos/metadata_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,14 @@ class Metadata(google.protobuf.message.Message):
"""

@property
def xrefs(
self,
) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]:
def xrefs(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]:
"""The DocFX xref URLs required for these docs."""
pass
@property
def xref_services(
self,
) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]:
def xref_services(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]:
"""The DocFX xref service URLs required for these docs."""
pass
def __init__(
self,
def __init__(self,
*,
update_time: typing.Optional[google.protobuf.timestamp_pb2.Timestamp] = ...,
name: typing.Text = ...,
Expand All @@ -105,38 +100,7 @@ class Metadata(google.protobuf.message.Message):
serving_path: typing.Text = ...,
xrefs: typing.Optional[typing.Iterable[typing.Text]] = ...,
xref_services: typing.Optional[typing.Iterable[typing.Text]] = ...,
) -> None: ...
def HasField(
self, field_name: typing_extensions.Literal["update_time", b"update_time"]
) -> builtins.bool: ...
def ClearField(
self,
field_name: typing_extensions.Literal[
"distribution_name",
b"distribution_name",
"github_repository",
b"github_repository",
"issue_tracker",
b"issue_tracker",
"language",
b"language",
"name",
b"name",
"product_page",
b"product_page",
"serving_path",
b"serving_path",
"stem",
b"stem",
"update_time",
b"update_time",
"version",
b"version",
"xref_services",
b"xref_services",
"xrefs",
b"xrefs",
],
) -> None: ...

) -> None: ...
def HasField(self, field_name: typing_extensions.Literal["update_time",b"update_time"]) -> builtins.bool: ...
def ClearField(self, field_name: typing_extensions.Literal["distribution_name",b"distribution_name","github_repository",b"github_repository","issue_tracker",b"issue_tracker","language",b"language","name",b"name","product_page",b"product_page","serving_path",b"serving_path","stem",b"stem","update_time",b"update_time","version",b"version","xref_services",b"xref_services","xrefs",b"xrefs"]) -> None: ...
global___Metadata = Metadata
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
@nox.session(python=DEFAULT_PYTHON_VERSION)
def blacken(session):
session.install('black')
session.run('black', 'docuploader', 'tests')
session.run('black', 'docuploader', 'tests', '--extend-exclude', 'docuploader/protos')


@nox.session(python=DEFAULT_PYTHON_VERSION)
def lint(session):
session.install('mypy', 'flake8', 'black', 'types-pkg_resources')
session.run('pip', 'install', '-e', '.')
session.run('black', '--check', 'docuploader', 'tests')
session.run('black', '--check', 'docuploader', 'tests', '--extend-exclude', 'docuploader/protos')
session.run('flake8', 'docuploader', 'tests')
session.run('mypy', 'docuploader')

Expand Down
3 changes: 1 addition & 2 deletions owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@
templated_files = common.py_library()
s.move(templated_files / ".kokoro")

s.shell.run(["nox", "-s", "blacken"], hide_output=False)

s.shell.run(["nox", "-s", "generate_protos", "blacken"], hide_output=False)

0 comments on commit a61801a

Please sign in to comment.