Lint changed Python files in CI and hooks (#63)

Author: eselyavka

.githooks/pre-commit

@@ -14,18 +14,18 @@ if [[ ! -x "$PYTHON_BIN" ]]; then
     exit 1
 fi
 
-declare -a STAGED_NEW_FILES=()
+declare -a STAGED_CHANGED_FILES=()
 while IFS= read -r -d '' file; do
-    STAGED_NEW_FILES+=("$file")
-done < <(git diff --cached --name-only --diff-filter=AR -z)
+    STAGED_CHANGED_FILES+=("$file")
+done < <(git diff --cached --name-only --diff-filter=ACMR -z)
 
 validate_leetcode_filenames() {
     local invalid=0
     local package_init='practice/leetcode/__init__.py'
     local solution_pattern='^practice/leetcode/solutions_[0-9]{5}/solution_[0-9]{5}\.py$'
     local init_pattern='^practice/leetcode/solutions_[0-9]{5}/__init__\.py$'
 
-    for file in ${STAGED_NEW_FILES[@]+"${STAGED_NEW_FILES[@]}"}; do
+    for file in ${STAGED_CHANGED_FILES[@]+"${STAGED_CHANGED_FILES[@]}"}; do
         if [[ "$file" != practice/leetcode/* ]]; then
             continue
         fi
@@ -51,8 +51,8 @@ collect_new_python_files() {
     local file
     NEW_PYTHON_FILES=()
 
-    for file in ${STAGED_NEW_FILES[@]+"${STAGED_NEW_FILES[@]}"}; do
-        if [[ "$file" == archive/* || "$file" == practice/leetcode/* ]]; then
+    for file in ${STAGED_CHANGED_FILES[@]+"${STAGED_CHANGED_FILES[@]}"}; do
+        if [[ "$file" == archive/* ]]; then
             continue
         fi
 
@@ -71,9 +71,9 @@ declare -a NEW_PYTHON_FILES
 collect_new_python_files
 
 if [[ ${#NEW_PYTHON_FILES[@]:-0} -eq 0 ]]; then
-    echo "No newly added Python files staged for pylint."
+    echo "No changed Python files staged for pylint."
     exit 0
 fi
 
-echo "Running pylint on newly added Python files..."
+echo "Running pylint on changed Python files..."
 "$PYTHON_BIN" -m pylint --jobs=1 --fail-under="$PYLINT_FAIL_UNDER" "${NEW_PYTHON_FILES[@]}"

.github/workflows/pylint.yml

@@ -26,8 +26,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install .[dev,reporter] pylint
-    - name: Collect newly added Python files
-      id: added-python
+    - name: Collect changed Python files
+      id: changed-python
       run: |
         if [ "${{ github.event_name }}" = "pull_request" ]; then
           base_sha="${{ github.event.pull_request.base.sha }}"
@@ -42,16 +42,15 @@ jobs:
         fi
 
         python_files="$(
-          git diff --name-only --diff-filter=AR "$base_sha" "$head_sha" -- '*.py' \
-            ':(exclude)archive/**' \
-            ':(exclude)practice/leetcode/**' | tr '\n' ' '
+          git diff --name-only --diff-filter=ACMR "$base_sha" "$head_sha" -- '*.py' \
+            ':(exclude)archive/**' | tr '\n' ' '
         )"
         echo "files=$python_files" >> "$GITHUB_OUTPUT"
-    - name: Analyse newly added Python files with pylint
-      if: steps.added-python.outputs.files != ''
+    - name: Analyse changed Python files with pylint
+      if: steps.changed-python.outputs.files != ''
       run: |
-        pylint --jobs=1 --fail-under="$PYLINT_FAIL_UNDER" ${{ steps.added-python.outputs.files }}
-    - name: Skip pylint when no new Python files were added
-      if: steps.added-python.outputs.files == ''
+        pylint --jobs=1 --fail-under="$PYLINT_FAIL_UNDER" ${{ steps.changed-python.outputs.files }}
+    - name: Skip pylint when no changed Python files were found
+      if: steps.changed-python.outputs.files == ''
       run: |
-        echo "No newly added Python files to lint."
+        echo "No changed Python files to lint."