Update CI, devcontainers and deps

istupakov · istupakov · commit 8ac9495bd167 · 2026-02-21T12:28:59.000Z
diff --git a/.devcontainer/cpu/devcontainer.json b/.devcontainer/cpu/devcontainer.json
@@ -15,10 +15,6 @@
 				"vincent-templier.vscode-netron"
 			],
 			"settings": {
-				"python-env.globalSearchPaths": [
-					"~/.venvs"
-				],
-				"python-envs.terminal.autoActivationType": "shellStartup",
 				"python.defaultInterpreterPath": "~/.venvs/default/bin/python"
 			}
 		}
diff --git a/.devcontainer/cuda/devcontainer.json b/.devcontainer/cuda/devcontainer.json
@@ -9,7 +9,9 @@
 		"gpu": true
 	},
 	"features": {
-		"ghcr.io/devcontainers/features/common-utils:2": {}
+		"ghcr.io/devcontainers/features/common-utils:2": {
+			"username": "ubuntu"
+		}
 	},
 	"customizations": {
 		"vscode": {
@@ -23,16 +25,13 @@
 				"vincent-templier.vscode-netron"
 			],
 			"settings": {
-				"python-env.globalSearchPaths": [
-					"~/.venvs"
-				],
-				"python-envs.terminal.autoActivationType": "shellStartup",
 				"python.defaultInterpreterPath": "~/.venvs/default/bin/python"
 			}
 		}
 	},
+	"remoteUser": "ubuntu",
 	"remoteEnv": {
-		"UV_PROJECT_ENVIRONMENT": "/home/vscode/.venvs/default"
+		"UV_PROJECT_ENVIRONMENT": "/home/ubuntu/.venvs/default"
 	},
 	"postCreateCommand": "curl -LsSf https://astral.sh/uv/install.sh | sh",
 	"postStartCommand": "uv sync"
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -78,42 +78,50 @@ jobs:
             macos-latest,
             ubuntu-24.04-arm,
             windows-11-arm,
+            macos-15-intel,
           ]
         include:
+          - soundfile: soundfile
           - python-version: "3.10"
-            numpy-version: numpy==1.22.4
-            onnxruntime-version: onnxruntime==1.18.1
-            hf-hub-version: huggingface-hub==0.30.2
-            typing-version: typing-extensions==4.6.0
+            numpy: numpy==1.22.4
+            onnxruntime: onnxruntime==1.18.1
+            hf-hub: huggingface-hub==0.30.2
+            typing: typing-extensions==4.6.0
           - python-version: "3.11"
-            numpy-version: numpy~=1.26
-            onnxruntime-version: onnxruntime~=1.20.1
-            hf-hub-version: huggingface-hub~=0.36
+            numpy: numpy~=1.26
+            onnxruntime: onnxruntime~=1.20.1
+            hf-hub: huggingface-hub~=0.36
           - python-version: "3.12"
-            numpy-version: numpy~=2.0.2
-            onnxruntime-version: onnxruntime~=1.22.1
-            hf-hub-version: huggingface-hub~=1.0.1
+            numpy: numpy~=2.0.2
+            onnxruntime: onnxruntime~=1.22.1
+            hf-hub: huggingface-hub~=1.0.1
           - python-version: "3.13"
-            numpy-version: numpy~=2.3.5
-            onnxruntime-version: onnxruntime~=1.23.2
+            numpy: numpy~=2.3.5
+            onnxruntime: onnxruntime~=1.23.2
           - python-version: "3.13t"
             os: ubuntu-latest
+            soundfile: ""
           - python-version: "3.13t"
             os: ubuntu-24.04-arm
+            soundfile: ""
           - python-version: "3.14t"
             os: ubuntu-latest
+            soundfile: soundfile
           - python-version: "3.14t"
             os: ubuntu-24.04-arm
+            soundfile: soundfile
           - os: windows-11-arm
-            numpy-version: numpy~=2.3.5
-            onnxruntime-version: onnxruntime>=1.24.2
+            numpy: numpy~=2.3.5
+            onnxruntime: onnxruntime~=1.24.2
           - os: windows-11-arm
             python-version: "3.14"
-            numpy-version: numpy>=2.4.2
+            numpy: ""
+            onnxruntime: ""
         exclude:
           - os: windows-11-arm
             python-version: "3.10"
-
+          - os: macos-15-intel
+            python-version: "3.14"
     steps:
       - uses: actions/checkout@v6
       - name: Install uv with Python ${{ matrix.python-version }}
@@ -130,10 +138,11 @@ jobs:
         shell: bash
         run: >-
           uv pip install --group test ./dist/onnx_asr-*.whl
-          ${{ matrix.numpy-version }}
-          ${{ matrix.onnxruntime-version }}
-          ${{ matrix.hf-hub-version }}
-          ${{ matrix.typing-version }}
+          ${{ matrix.numpy }} 
+          ${{ matrix.onnxruntime }}
+          ${{ matrix.hf-hub }}
+          ${{ matrix.typing }}
+          ${{ matrix.soundfile }}
 
       - name: Cache HF models
         uses: actions/cache@v5
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,5 +14,12 @@
         "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
         "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format",
         "tag:yaml.org,2002:python/object/apply:pymdownx.slugs.slugify mapping"
-    ]
+    ],
+    "files.exclude": {
+        ".coverage": true,
+        ".mypy_cache": true,
+        ".pytest_cache": true,
+        ".ruff_cache": true,
+        "**/__pycache__": true
+    }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,84 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "uv: ruff format",
+            "type": "shell",
+            "command": "uv run ruff format",
+            "problemMatcher": [],
+            "detail": "Format code using Ruff"
+        },
+        {
+            "label": "uv: ruff check",
+            "type": "shell",
+            "command": "uv run ruff check",
+            "problemMatcher": [],
+            "detail": "Lint with Ruff"
+        },
+        {
+            "label": "uv: mypy",
+            "type": "shell",
+            "command": "uv run mypy .",
+            "problemMatcher": [],
+            "detail": "Check types with mypy"
+        },
+        {
+            "label": "uv: build",
+            "type": "shell",
+            "command": "uv build --clear",
+            "dependsOrder": "sequence",
+            "dependsOn": [
+                "uv: ruff format",
+                "uv: ruff check",
+                "uv: mypy"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [],
+            "detail": "Lint and build dist"
+        },
+        {
+            "label": "uv: mkdocs build",
+            "type": "shell",
+            "command": "uv run --group docs mkdocs build --clean --strict",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": "**/*.md"
+            },
+            "detail": "Build docs with mkdocs"
+        },
+        {
+            "label": "uv: mkdocs serve",
+            "type": "shell",
+            "command": "uv run --group docs mkdocs serve",
+            "problemMatcher": [],
+            "detail": "Serve docs with mkdocs"
+        },
+        {
+            "label": "uv: pytest",
+            "type": "shell",
+            "command": "uv run --group test-all pytest --cov",
+            "problemMatcher": [],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "detail": "Run all tests with pytest"
+        },
+        {
+            "label": "clean",
+            "type": "shell",
+            "command": "find . -type d -name '__pycache__' -exec rm -rf {} +; rm -rf .ruff_cache .pytest_cache .mypy_cache dist site",
+            "windows": {
+                "command": "Get-ChildItem -Path . -Recurse -Include '__pycache__','.ruff_cache','.pytest_cache','.mypy_cache','dist','site' | Remove-Item -Recurse -Force"
+            },
+            "problemMatcher": [],
+            "detail": "Clean caches and build artifacts"
+        }
+    ]
+}
diff --git a/hatch_build.py b/hatch_build.py
@@ -11,7 +11,7 @@ class _BuildPreprocessorsHook(BuildHookInterface):  # type: ignore[type-arg]
     artifacts_path = Path("src/onnx_asr/preprocessors/data")
 
     def initialize(self, version: str, build_data: dict[str, Any]) -> None:
-        self.app.display_info(f"Build ONNX preprocessor models ({self.artifacts_path})")
+        self.app.display_info(f"Build ONNX and NumPy preprocessors ({self.artifacts_path})")
         sys.path.append(self.root)
 
         from preprocessors.build import build  # noqa: PLC0415
diff --git a/pyproject.toml b/pyproject.toml
@@ -83,16 +83,24 @@ test = [
     "onnxruntime>=1.18.1",
     "pytest>=9.0.2",
     "pytest-cov>=7.0.0",
-    "soundfile>=0.13.1 ; python_full_version != '3.13.*'", # Don't exist for 3.13t
 ]
-test-preprocessors = [
+test-all = [
     "kaldi-native-fbank>=1.22.3",
     "nemo-toolkit[asr]>=2.6.2",
     "openai-whisper>=20250625",
+    "soundfile>=0.13.1",
     { include-group = "build" },
     { include-group = "test" },
 ]
 
+[tool.uv]
+cache-keys = [
+    { file = "pyproject.toml" },
+    { file = "hatch_build.py" },
+    { file = "preprocessors/*.py" },
+    { git = { commit = true, tags = true } },
+]
+
 [tool.uv.sources]
 torch = { index = "pytorch" }
 torchaudio = { index = "pytorch" }
@@ -122,6 +130,10 @@ module = ["onnxruntime.*"]
 follow_untyped_imports = true
 implicit_reexport = true
 
+[[tool.mypy.overrides]]
+module = ["soundfile.*"]
+ignore_missing_imports = true
+
 [[tool.mypy.overrides]]
 module = ["preprocessors.*"]
 follow_imports = "silent"
diff --git a/tests/onnx_asr/test_cli.py b/tests/onnx_asr/test_cli.py
@@ -41,7 +41,7 @@ def test_file_not_found_error(args_list: list[str]) -> None:
 
 def test_cli_run(args_list: list[str]) -> None:
     try:
-        import soundfile as sf  # type: ignore[import-untyped]  # noqa: PLC0415
+        import soundfile as sf  # noqa: PLC0415
     except (ImportError, OSError):
         pytest.skip("soundfile not available")
     args = parse_args(args_list)
diff --git a/tests/onnx_asr/test_read_wav.py b/tests/onnx_asr/test_read_wav.py
@@ -5,7 +5,7 @@
 import pytest
 
 try:
-    import soundfile as sf  # type: ignore[import-untyped]
+    import soundfile as sf
 except (ImportError, OSError):
     pytest.skip("soundfile not available", allow_module_level=True)
 
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@`
`15`	`15`	`"vincent-templier.vscode-netron"`
`16`	`16`	`],`
`17`	`17`	`"settings": {`
`18`		`- "python-env.globalSearchPaths": [`
`19`		`- "~/.venvs"`
`20`		`- ],`
`21`		`- "python-envs.terminal.autoActivationType": "shellStartup",`
`22`	`18`	`"python.defaultInterpreterPath": "~/.venvs/default/bin/python"`
`23`	`19`	`}`
`24`	`20`	`}`