Skip to content

Commit 5767e5a

Browse files
authored
Lint: improve linting rules (#54)
* Lint: improve linting rules * fix: incorrect black command and isort config
1 parent 86fc362 commit 5767e5a

File tree

12 files changed

+59
-37
lines changed

12 files changed

+59
-37
lines changed

.github/workflows/semantic-pr.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Semantic PR Title
2+
on:
3+
pull_request_target:
4+
types:
5+
- opened
6+
- reopened
7+
- edited
8+
- synchronize
9+
10+
jobs:
11+
main:
12+
name: Validate PR title
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: amannn/action-semantic-pull-request@v5
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/style-check.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ jobs:
1919
- name: Black
2020
run: |
2121
pip install --upgrade black
22-
# Note: black fails when it doesn't have to do anything.
23-
git diff --name-only --no-color --diff-filter=ACM $(git merge-base origin/main HEAD) |
24-
grep -v '\(\.json\|\.csv\|\.ipynb\|\.hpp\.in\|\.ref\|\.example\|\.txt\|\.lock\|\.js\|\.properties\)$' |
25-
2>/dev/null xargs black || true
26-
git diff --exit-code
22+
black --check --diff --include "(\\.pyi?|\\.ipynb)$" --exclude "" .
23+
24+
- name: isort
25+
run: |
26+
pip install --upgrade isort
27+
isort . -c
2728
2829
- name: yamllint
2930
run: |

.isort.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[settings]
2+
profile=black

cli/common.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
from functools import cache
2-
import sys
3-
from typing import Dict, List, Set
4-
from flags import TRACE
5-
from invoke import Context, Exit, Failure
6-
import dynaconf
71
import json
82
import os
3+
import shutil
4+
import sys
5+
from functools import cache
6+
from typing import Dict, List, Set
7+
98
import boto3
109
import botocore.client
11-
import shutil
10+
import dynaconf
11+
from flags import TRACE
12+
from invoke import Context, Exit, Failure
1213

1314
# Validate and provide defaults for the terraform state backend configuration
1415
TF_BACKEND_VALIDATORS = [

cli/core.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
from invoke import Context, task, Exit
2-
from botocore.exceptions import ClientError
3-
import time
41
import base64
5-
import json
62
import io
3+
import json
4+
import time
5+
6+
from botocore.exceptions import ClientError
77
from common import (
8+
AWS_REGION_VALIDATOR,
9+
RUNTIME_TFDIR,
810
TF_BACKEND_VALIDATORS,
911
active_modules,
10-
clean_modules,
11-
RUNTIME_TFDIR,
1212
auto_app_fmt,
13-
AWS_REGION_VALIDATOR,
14-
terraform_output,
1513
aws,
14+
clean_modules,
1615
parse_env,
16+
terraform_output,
1717
)
18-
18+
from invoke import Context, Exit, task
1919

2020
VALIDATORS = [
2121
*TF_BACKEND_VALIDATORS,

cli/main.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
from invoke import Program, Collection
1+
import pkgutil
22
import sys
3-
import core
3+
44
import common
5-
import plugins
6-
import pkgutil
5+
import core
76
import flags
7+
import plugins
8+
from invoke import Collection, Program
89

910

1011
def unhandled_exception(type, value, traceback):

cli/plugins/dask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Dask on AWS Lambda"""
22

3-
from invoke import task
43
import core
4+
from invoke import task
55

66

77
@task(autoprint=True)

cli/plugins/databend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Dremio on AWS Lambda"""
22

3-
from invoke import task
43
import core
4+
from invoke import task
55

66

77
@task(autoprint=True)

cli/plugins/dremio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Dremio on AWS Lambda"""
22

3-
from invoke import task
43
import core
4+
from invoke import task
55

66

77
@task(autoprint=True)

cli/plugins/monitoring.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import base64
2-
import dynaconf
32
import json
43
import time
4+
from datetime import datetime
5+
56
import common
7+
import dynaconf
8+
import plugins.dask as dask
69
import plugins.databend as databend
7-
import plugins.spark as spark
810
import plugins.dremio as dremio
9-
import plugins.dask as dask
11+
import plugins.spark as spark
1012
import plugins.trino as trino
11-
from datetime import datetime
13+
from common import REPOROOT, TF_BACKEND_VALIDATORS, auto_app_fmt
1214
from google.cloud import bigquery
1315
from google.oauth2 import service_account
14-
from invoke import task, Context
15-
16-
from common import REPOROOT, TF_BACKEND_VALIDATORS, auto_app_fmt
16+
from invoke import Context, task
1717

1818
MONITORING_TFDIR = f"{REPOROOT}/infra/monitoring"
1919
MONITORING_MODULE_DIR = f"{MONITORING_TFDIR}/bigquery"

0 commit comments

Comments
 (0)