From fce472c449316f836d133aa4e686dc6aa5e4b1cb Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 19:56:37 -0400
Subject: [PATCH] chore(python): add nox session to sort python imports (#230)

Source-Link: https://github.com/googleapis/synthtool/commit/1b71c10e20de7ed3f97f692f99a0e3399b67049f
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>
---
 .../.github/.OwlBot.lock.yaml                 |  4 +--
 packages/google-analytics-data/noxfile.py     | 27 ++++++++++++++++---
 .../samples/snippets/noxfile.py               | 21 +++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/packages/google-analytics-data/.github/.OwlBot.lock.yaml b/packages/google-analytics-data/.github/.OwlBot.lock.yaml
index bc893c979e20..7c454abf76f3 100644
--- a/packages/google-analytics-data/.github/.OwlBot.lock.yaml
+++ b/packages/google-analytics-data/.github/.OwlBot.lock.yaml
@@ -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
diff --git a/packages/google-analytics-data/noxfile.py b/packages/google-analytics-data/noxfile.py
index 1bcfac34cb85..7ca8fa6e59c7 100644
--- a/packages/google-analytics-data/noxfile.py
+++ b/packages/google-analytics-data/noxfile.py
@@ -25,7 +25,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"
 
@@ -83,7 +84,7 @@ def lint(session):
     session.run(
         "black",
         "--check",
-        *BLACK_PATHS,
+        *LINT_PATHS,
     )
     session.run("flake8", "google", "tests")
 
@@ -94,7 +95,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,
     )
 
 
diff --git a/packages/google-analytics-data/samples/snippets/noxfile.py b/packages/google-analytics-data/samples/snippets/noxfile.py
index 949e0fde9ae1..38bb0a572b81 100644
--- a/packages/google-analytics-data/samples/snippets/noxfile.py
+++ b/packages/google-analytics-data/samples/snippets/noxfile.py
@@ -30,6 +30,7 @@
 # WARNING - WARNING - WARNING - WARNING - WARNING
 
 BLACK_VERSION = "black==22.3.0"
+ISORT_VERSION = "isort==5.10.1"
 
 # Copy `noxfile_config.py` to your directory and modify it instead.
 
@@ -168,12 +169,32 @@ def lint(session: nox.sessions.Session) -> None:
 
 @nox.session
 def blacken(session: nox.sessions.Session) -> None:
+    """Run black. Format code to uniform standard."""
     session.install(BLACK_VERSION)
     python_files = [path for path in os.listdir(".") if path.endswith(".py")]
 
     session.run("black", *python_files)
 
 
+#
+# format = isort + black
+#
+
+@nox.session
+def format(session: nox.sessions.Session) -> None:
+    """
+    Run isort to sort imports. Then run black
+    to format code to uniform standard.
+    """
+    session.install(BLACK_VERSION, ISORT_VERSION)
+    python_files = [path for path in os.listdir(".") if path.endswith(".py")]
+
+    # 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", *python_files)
+    session.run("black", *python_files)
+
+
 #
 # Sample Tests
 #