Skip to content

Commit cabb9df

Browse files
committed
add invoke check cmd
update pipenv scripts and make commands
1 parent 10e49e1 commit cabb9df

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ lint:
2121
pylint $(APP) || true
2222

2323
fmt:
24-
isort --apply --atomic
25-
black . -l 120
24+
invoke fmt
2625

2726
check-fmt:
28-
isort -rc --check
29-
black . --check --diff
27+
invoke check --fmt --sort

Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ python_version = "3.8"
2828
[scripts]
2929
dev = "uvicorn app.main:APP --reload"
3030
start = "uvicorn app.main:APP"
31-
fmt = "black . -l 120"
32-
sort = "isort --apply --atomic"
31+
fmt = "invoke fmt"
32+
sort = "invoke sort"

tasks.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,22 @@ def fmt(ctx, targets="."):
2727
print("formatting ...")
2828
args = ["black", targets]
2929
ctx.run(" ".join(args))
30+
31+
@invoke.task
32+
def check(ctx, fmt=False, sort=False):
33+
"""Check code format and import order."""
34+
if not any([fmt, sort]):
35+
fmt = True
36+
sort = True
37+
38+
fmt_args = ["black", "--check", "--diff", "."]
39+
sort_args = ["isort", "-rc", "--check", "--diff", "."]
40+
cmd_args = []
41+
42+
if fmt:
43+
cmd_args.extend(fmt_args)
44+
if sort:
45+
if cmd_args:
46+
cmd_args.append("&")
47+
cmd_args.extend(sort_args)
48+
ctx.run(" ".join(cmd_args))

0 commit comments

Comments
 (0)