Merge branch 'master' into master

lhotse-speech · Feb 11, 2025 · b36c0d6 · b36c0d6
2 parents e5a025a + afd7cce
commit b36c0d6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/lhotse/workflows/dnsmos.py b/lhotse/workflows/dnsmos.py
@@ -209,5 +209,8 @@ def _annotate_cuts(
 
         for future in tqdm(futures, desc="Processing"):
             cut, result = future.result()
-            new_cut = fastcopy(cut, custom=result)
-            yield new_cut
+            if cut.custom is not None:
+                cut.custom.update(result)
+            else:
+                cut.custom = result
+            yield cut
diff --git a/tools/check_style.sh b/tools/check_style.sh