mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-12 18:45:20 +00:00
Add isort to the style checking for python
This commit is contained in:
parent
c4cc1576eb
commit
d396ec3310
@ -30,7 +30,7 @@ disable = '''
|
||||
|
||||
[tool.isort]
|
||||
profile = "black"
|
||||
src_paths = ["src", "tests/ci", "tests/sqllogic"]
|
||||
src_paths = ["src", "tests/ci", "tests/sqllogic", "tests/queries", "tests/integration"]
|
||||
|
||||
[tool.black]
|
||||
required-version = 24
|
||||
|
36
utils/check-style/check-isort
Executable file
36
utils/check-style/check-isort
Executable file
@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
# We check only our code, that's why we skip contrib
|
||||
GIT_ROOT=$(git rev-parse --show-cdup)
|
||||
GIT_ROOT=${GIT_ROOT:-./}
|
||||
tmp=$(mktemp)
|
||||
|
||||
# Find all *.py, *.python files and executable files without extension
|
||||
# that are determined as python scripts by 'file' util
|
||||
# in the repo except the contrib directory.
|
||||
find_cmd=(
|
||||
find "$GIT_ROOT" -type f -not -path "${GIT_ROOT}contrib/*"
|
||||
\(
|
||||
\(
|
||||
-name '*.py' -or -name "*.python" -or
|
||||
\(
|
||||
-executable -not -name "*.*" -exec sh -c 'file {} | grep -q "Python script"' \;
|
||||
\)
|
||||
\)
|
||||
# We skip modules generated by the protocol buffer compiler from *.proto files.
|
||||
-and -not -name '*_pb2.py' -and -not -name '*_pb2_grpc.py'
|
||||
\)
|
||||
)
|
||||
|
||||
if ! "${find_cmd[@]}" -exec isort --check --diff {} + 1>"$tmp" 2>&1; then
|
||||
# Show the result only if some files need formatting
|
||||
cat "$tmp"
|
||||
# Apply formatting
|
||||
"${find_cmd[@]}" -exec isort {} + 1>/dev/null 2>&1
|
||||
# Automatically add changed files to stage
|
||||
"${find_cmd[@]}" -exec git add -u {} + 1>/dev/null 2>&1
|
||||
fi
|
||||
|
||||
rm "$tmp"
|
@ -10,6 +10,12 @@ echo "Check " | ts
|
||||
runtime=$((`date +%s`-start))
|
||||
echo "Check python formatting with black. Done. $runtime seconds."
|
||||
|
||||
start=`date +%s`
|
||||
echo "Check " | ts
|
||||
./check-isort -n |& tee /test_output/isort_output.txt
|
||||
runtime=$((`date +%s`-start))
|
||||
echo "Check python formatting with isort. Done. $runtime seconds."
|
||||
|
||||
start=`date +%s`
|
||||
./check-pylint -n |& tee /test_output/pylint_output.txt
|
||||
runtime=$((`date +%s`-start))
|
||||
|
@ -17,6 +17,7 @@ def process_result(result_folder):
|
||||
"shellcheck",
|
||||
"style",
|
||||
"pylint",
|
||||
"isort",
|
||||
"black",
|
||||
"flake8",
|
||||
"mypy",
|
||||
|
Loading…
Reference in New Issue
Block a user