Skip to content

Commit 5a4998f

Browse files
chore(python): add nox session to sort python imports (#518)
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>
1 parent 93eb305 commit 5a4998f

File tree

3 files changed

+48
-5
lines changed

3 files changed

+48
-5
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163
17-
# created: 2022-04-06T10:30:21.687684602Z
16+
digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416
17+
# created: 2022-04-20T23:42:53.970438194Z

noxfile.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import nox
2727

2828
BLACK_VERSION = "black==22.3.0"
29-
BLACK_PATHS = ["docs", "pandas_gbq", "tests", "noxfile.py", "setup.py"]
29+
ISORT_VERSION = "isort==5.10.1"
30+
LINT_PATHS = ["docs", "pandas_gbq", "tests", "noxfile.py", "setup.py"]
3031

3132
DEFAULT_PYTHON_VERSION = "3.8"
3233

@@ -92,7 +93,7 @@ def lint(session):
9293
session.run(
9394
"black",
9495
"--check",
95-
*BLACK_PATHS,
96+
*LINT_PATHS,
9697
)
9798
session.run("flake8", "pandas_gbq", "tests")
9899

@@ -103,7 +104,27 @@ def blacken(session):
103104
session.install(BLACK_VERSION)
104105
session.run(
105106
"black",
106-
*BLACK_PATHS,
107+
*LINT_PATHS,
108+
)
109+
110+
111+
@nox.session(python=DEFAULT_PYTHON_VERSION)
112+
def format(session):
113+
"""
114+
Run isort to sort imports. Then run black
115+
to format code to uniform standard.
116+
"""
117+
session.install(BLACK_VERSION, ISORT_VERSION)
118+
# Use the --fss option to sort imports using strict alphabetical order.
119+
# See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
120+
session.run(
121+
"isort",
122+
"--fss",
123+
*LINT_PATHS,
124+
)
125+
session.run(
126+
"black",
127+
*LINT_PATHS,
107128
)
108129

109130

samples/snippets/noxfile.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
# WARNING - WARNING - WARNING - WARNING - WARNING
3131

3232
BLACK_VERSION = "black==22.3.0"
33+
ISORT_VERSION = "isort==5.10.1"
3334

3435
# Copy `noxfile_config.py` to your directory and modify it instead.
3536

@@ -168,12 +169,33 @@ def lint(session: nox.sessions.Session) -> None:
168169

169170
@nox.session
170171
def blacken(session: nox.sessions.Session) -> None:
172+
"""Run black. Format code to uniform standard."""
171173
session.install(BLACK_VERSION)
172174
python_files = [path for path in os.listdir(".") if path.endswith(".py")]
173175

174176
session.run("black", *python_files)
175177

176178

179+
#
180+
# format = isort + black
181+
#
182+
183+
184+
@nox.session
185+
def format(session: nox.sessions.Session) -> None:
186+
"""
187+
Run isort to sort imports. Then run black
188+
to format code to uniform standard.
189+
"""
190+
session.install(BLACK_VERSION, ISORT_VERSION)
191+
python_files = [path for path in os.listdir(".") if path.endswith(".py")]
192+
193+
# Use the --fss option to sort imports using strict alphabetical order.
194+
# See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
195+
session.run("isort", "--fss", *python_files)
196+
session.run("black", *python_files)
197+
198+
177199
#
178200
# Sample Tests
179201
#

0 commit comments

Comments
 (0)