chore(python): add nox session to sort python imports (#164)

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>
GoogleCloudPlatform · Apr 21, 2022 · f6f8865 · f6f8865
1 parent dbf7750
commit f6f8865
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/contact-center-insights/snippets/noxfile.py b/contact-center-insights/snippets/noxfile.py
@@ -22,14 +22,14 @@
 
 import nox
 
-
 # WARNING - WARNING - WARNING - WARNING - WARNING
 # WARNING - WARNING - WARNING - WARNING - WARNING
 #           DO NOT EDIT THIS FILE EVER!
 # WARNING - WARNING - WARNING - WARNING - WARNING
 # 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 +168,33 @@ 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
 #

diff --git a/contact-center-insights/snippets/test_create_analysis.py b/contact-center-insights/snippets/test_create_analysis.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_analysis

diff --git a/contact-center-insights/snippets/test_create_conversation.py b/contact-center-insights/snippets/test_create_conversation.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_conversation

diff --git a/contact-center-insights/snippets/test_create_conversation_with_ttl.py b/contact-center-insights/snippets/test_create_conversation_with_ttl.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_conversation_with_ttl

diff --git a/contact-center-insights/snippets/test_create_issue_model.py b/contact-center-insights/snippets/test_create_issue_model.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_issue_model

diff --git a/contact-center-insights/snippets/test_create_phrase_matcher_all_of.py b/contact-center-insights/snippets/test_create_phrase_matcher_all_of.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_phrase_matcher_all_of

diff --git a/contact-center-insights/snippets/test_create_phrase_matcher_any_of.py b/contact-center-insights/snippets/test_create_phrase_matcher_any_of.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import create_phrase_matcher_any_of

diff --git a/contact-center-insights/snippets/test_enable_pubsub_notifications.py b/contact-center-insights/snippets/test_enable_pubsub_notifications.py
@@ -15,11 +15,8 @@
 import uuid
 
 import google.auth
-
-from google.cloud import contact_center_insights_v1
-from google.cloud import pubsub_v1
+from google.cloud import contact_center_insights_v1, pubsub_v1
 from google.protobuf import field_mask_pb2
-
 import pytest
 
 import enable_pubsub_notifications

diff --git a/contact-center-insights/snippets/test_export_to_bigquery.py b/contact-center-insights/snippets/test_export_to_bigquery.py
@@ -15,9 +15,7 @@
 import uuid
 
 import google.auth
-
 from google.cloud import bigquery
-
 import pytest
 
 import export_to_bigquery

diff --git a/contact-center-insights/snippets/test_get_operation.py b/contact-center-insights/snippets/test_get_operation.py
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
-
 import pytest
 
 import get_operation

diff --git a/contact-center-insights/snippets/test_set_project_ttl.py b/contact-center-insights/snippets/test_set_project_ttl.py
@@ -13,10 +13,8 @@
 # limitations under the License.
 #
 import google.auth
-
 from google.cloud import contact_center_insights_v1
 from google.protobuf import field_mask_pb2
-
 import pytest
 
 import set_project_ttl