From cb4d71ac2c5f01eaf11d3af69ad078837560a6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20=C5=BBelasko?= <petezor@gmail.com>
Date: Tue, 11 Feb 2025 11:04:40 -0500
Subject: [PATCH] Update CI (#1452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update Python version in linter checks

Signed-off-by: Piotr Żelasko <petezor@gmail.com>

* fix

* move kaldifeat test to py3.10, remove unused script

* move kaldifeat test to py3.12, update torch version

* drop kaldifeat tests and python3.8+torchaudio tests

* fix

* fix

---------

Signed-off-by: Piotr Żelasko <petezor@gmail.com>
---
 .github/workflows/flake8.yml     |  4 ++--
 .github/workflows/isort.yml      |  2 +-
 .github/workflows/unit_tests.yml | 14 +++++++-------
 .pre-commit-config.yaml          |  2 +-
 tools/check_style.sh             | 12 ------------
 5 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100755 tools/check_style.sh

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index 57e382158..3f09db763 100644
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [ 3.12 ]
 
     steps:
     - uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install flake8
       run: |
-        python -m pip install --upgrade pip flake8==4.0.1
+        python -m pip install --upgrade pip flake8==7.1.1
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml
index 310d2b785..242c6184c 100644
--- a/.github/workflows/isort.yml
+++ b/.github/workflows/isort.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [ 3.12 ]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 2b17da4ec..1640d0e02 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -16,21 +16,21 @@ jobs:
     strategy:
       matrix:
         include:
-          - python-version: "3.8"
-            torch-install-cmd: "pip install torch==1.12.1 torchaudio==0.12.1 --extra-index-url https://download.pytorch.org/whl/cpu"
-            extra_deps: kaldifeat
+          - python-version: "3.8"  # note: no torchaudio
+            torch-install-cmd: "pip install torch==1.12.1 --extra-index-url https://download.pytorch.org/whl/cpu"
+            extra_deps: ""
           - python-version: "3.9"
             torch-install-cmd: "pip install torch==2.3 torchaudio==2.3 --extra-index-url https://download.pytorch.org/whl/cpu"
             extra_deps: ""
           - python-version: "3.10"  # note: no torchaudio
-            torch-install-cmd: "pip install torch==2.3 --extra-index-url https://download.pytorch.org/whl/cpu"
+            torch-install-cmd: "pip install torch==2.4 --extra-index-url https://download.pytorch.org/whl/cpu"
             extra_deps: ""
           - python-version: "3.11"  # note: no torchaudio
-            torch-install-cmd: "pip install torch==2.3 --extra-index-url https://download.pytorch.org/whl/cpu"
+            torch-install-cmd: "pip install torch==2.5 --extra-index-url https://download.pytorch.org/whl/cpu"
             extra_deps: ""
           - python-version: "3.12"  # note: no torchaudio
-            torch-install-cmd: "pip install torch==2.3 --extra-index-url https://download.pytorch.org/whl/cpu"
-            extra_deps: ""
+            torch-install-cmd: "pip install torch==2.5 --extra-index-url https://download.pytorch.org/whl/cpu"
+            extra_deps: ""  # kaldifeat
 
       fail-fast: false
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2c393d50e..62eb99e74 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 7.1.1
     hooks:
       - id: flake8
         args: ['--select=E9,F63,F7,F82']
diff --git a/tools/check_style.sh b/tools/check_style.sh
deleted file mode 100755
index ee648f1f5..000000000
--- a/tools/check_style.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-IGNORE_LIST='F401,F403,F811,E131,E124,E126,E501,E741,W503'
-MAX_LINE_LENGTH=120
-
-BASE=$(git rev-parse --show-toplevel)
-ALLFILES=$(git ls-tree --full-tree --name-only -r HEAD | grep -e ".*\.py\$")
-for FILE in ${ALLFILES}; do
-  flake8 --ignore ${IGNORE_LIST} \
-    --max-line-length ${MAX_LINE_LENGTH} \
-    ${BASE}/${FILE}
-done