Skip to content

Commit

Permalink
chore(python): add nox session to sort python imports (#88)
Browse files Browse the repository at this point in the history
Source-Link: googleapis/synthtool@1b71c10
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
gcf-owl-bot[bot] and gcf-owl-bot[bot] authored Apr 21, 2022
1 parent cab0a65 commit a62660c
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163
# created: 2022-04-06T10:30:21.687684602Z
digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416
# created: 2022-04-20T23:42:53.970438194Z
2 changes: 1 addition & 1 deletion packages/google-cloud-appengine-logging/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys
import os
import shlex
import sys

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
#


from google.cloud.appengine_logging_v1.types.request_log import LogLine
from google.cloud.appengine_logging_v1.types.request_log import RequestLog
from google.cloud.appengine_logging_v1.types.request_log import SourceLocation
from google.cloud.appengine_logging_v1.types.request_log import SourceReference
from google.cloud.appengine_logging_v1.types.request_log import (
LogLine,
RequestLog,
SourceLocation,
SourceReference,
)

__all__ = (
"LogLine",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
#


from .types.request_log import LogLine
from .types.request_log import RequestLog
from .types.request_log import SourceLocation
from .types.request_log import SourceReference
from .types.request_log import LogLine, RequestLog, SourceLocation, SourceReference

__all__ = (
"LogLine",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from .request_log import (
LogLine,
RequestLog,
SourceLocation,
SourceReference,
)
from .request_log import LogLine, RequestLog, SourceLocation, SourceReference

__all__ = (
"LogLine",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
import proto # type: ignore

from google.logging.type import log_severity_pb2 # type: ignore
from google.protobuf import duration_pb2 # type: ignore
from google.protobuf import timestamp_pb2 # type: ignore

import proto # type: ignore

__protobuf__ = proto.module(
package="google.appengine.logging.v1",
Expand Down
28 changes: 25 additions & 3 deletions packages/google-cloud-appengine-logging/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# Generated by synthtool. DO NOT EDIT!

from __future__ import absolute_import

import os
import pathlib
import shutil
Expand All @@ -25,7 +26,8 @@
import nox

BLACK_VERSION = "black==22.3.0"
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
ISORT_VERSION = "isort==5.10.1"
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.8"

Expand Down Expand Up @@ -83,7 +85,7 @@ def lint(session):
session.run(
"black",
"--check",
*BLACK_PATHS,
*LINT_PATHS,
)
session.run("flake8", "google", "tests")

Expand All @@ -94,7 +96,27 @@ def blacken(session):
session.install(BLACK_VERSION)
session.run(
"black",
*BLACK_PATHS,
*LINT_PATHS,
)


@nox.session(python=DEFAULT_PYTHON_VERSION)
def format(session):
"""
Run isort to sort imports. Then run black
to format code to uniform standard.
"""
session.install(BLACK_VERSION, ISORT_VERSION)
# Use the --fss option to sort imports using strict alphabetical order.
# See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
session.run(
"isort",
"--fss",
*LINT_PATHS,
)
session.run(
"black",
*LINT_PATHS,
)


Expand Down
1 change: 1 addition & 0 deletions packages/google-cloud-appengine-logging/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#
import io
import os

import setuptools # type: ignore

version = "1.1.1"
Expand Down

0 comments on commit a62660c

Please sign in to comment.