Merge branch 'main' into add-dates-to-release-notes

Author: YuriiMotov

.github/workflows/smokeshow.yml

@@ -27,7 +27,7 @@ jobs:
             pyproject.toml
             uv.lock
       - run: uv sync --locked --no-dev --group github-actions
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: coverage-html
           path: htmlcov

.github/workflows/test.yml

@@ -85,7 +85,7 @@ jobs:
           COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
           CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
       - name: Store coverage files
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-${{ runner.os }}-${{ matrix.python-version }}
           path: coverage
@@ -111,7 +111,7 @@ jobs:
             pyproject.toml
             uv.lock
       - name: Get coverage files
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           pattern: coverage-*
           path: coverage
@@ -122,7 +122,7 @@ jobs:
       - run: uv run coverage combine coverage
       - run: uv run coverage html --title "Coverage for ${{ github.sha }}"
       - name: Store coverage HTML
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-html
           path: htmlcov

.pre-commit-config.yaml

@@ -33,3 +33,10 @@ repos:
         require_serial: true
         language: unsupported
         pass_filenames: false
+
+      - id: local-ty
+        name: ty check
+        entry: uv run ty check src tests
+        require_serial: true
+        language: unsupported
+        pass_filenames: false

pyproject.toml

@@ -69,8 +69,9 @@ tests = [
     "fastapi>=0.128.0",
     "mypy==1.19.1",
     "pytest>=7.4.0,<10.0.0",
-    "ruff==0.15.2",
+    "ruff==0.15.8",
     "uvicorn>=0.39.0",
+    "ty>=0.0.25",
 ]
 
 [build-system]
@@ -156,3 +157,6 @@ known-third-party = ["typer", "fastapi"]
 [tool.ruff.lint.pyupgrade]
 # Preserve types, even if a file imports `from __future__ import annotations`.
 keep-runtime-typing = true
+
+[tool.ty.terminal]
+error-on-warning = true

release-notes.md

@@ -4,6 +4,32 @@
 
 ### Internal
 
+* ⬆ Bump fastapi from 0.135.2 to 0.135.3. PR [#353](https://github.com/fastapi/fastapi-cli/pull/353) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ty from 0.0.26 to 0.0.27. PR [#352](https://github.com/fastapi/fastapi-cli/pull/352) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.15.7 to 0.15.8. PR [#347](https://github.com/fastapi/fastapi-cli/pull/347) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi from 0.135.1 to 0.135.2. PR [#345](https://github.com/fastapi/fastapi-cli/pull/345) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ty from 0.0.25 to 0.0.26. PR [#348](https://github.com/fastapi/fastapi-cli/pull/348) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi-cloud-cli from 0.15.0 to 0.15.1. PR [#349](https://github.com/fastapi/fastapi-cli/pull/349) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.3.6 to 0.3.8. PR [#344](https://github.com/fastapi/fastapi-cli/pull/344) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ty from 0.0.24 to 0.0.25. PR [#346](https://github.com/fastapi/fastapi-cli/pull/346) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.15.6 to 0.15.7. PR [#342](https://github.com/fastapi/fastapi-cli/pull/342) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ty from 0.0.23 to 0.0.24. PR [#343](https://github.com/fastapi/fastapi-cli/pull/343) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump uvicorn from 0.41.0 to 0.42.0. PR [#340](https://github.com/fastapi/fastapi-cli/pull/340) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.3.5 to 0.3.6. PR [#339](https://github.com/fastapi/fastapi-cli/pull/339) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ty from 0.0.21 to 0.0.23. PR [#338](https://github.com/fastapi/fastapi-cli/pull/338) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* 👷 Add `ty` to precommit. PR [#335](https://github.com/fastapi/fastapi-cli/pull/335) by [@svlandeg](https://github.com/svlandeg).
+* ⬆ Bump ruff from 0.15.5 to 0.15.6. PR [#337](https://github.com/fastapi/fastapi-cli/pull/337) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi-cloud-cli from 0.14.1 to 0.15.0. PR [#336](https://github.com/fastapi/fastapi-cli/pull/336) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.3.4 to 0.3.5. PR [#334](https://github.com/fastapi/fastapi-cli/pull/334) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi-cloud-cli from 0.14.0 to 0.14.1. PR [#333](https://github.com/fastapi/fastapi-cli/pull/333) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.15.4 to 0.15.5. PR [#331](https://github.com/fastapi/fastapi-cli/pull/331) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi from 0.133.1 to 0.135.1. PR [#329](https://github.com/fastapi/fastapi-cli/pull/329) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump prek from 0.3.3 to 0.3.4. PR [#330](https://github.com/fastapi/fastapi-cli/pull/330) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.15.2 to 0.15.4. PR [#328](https://github.com/fastapi/fastapi-cli/pull/328) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi from 0.133.0 to 0.133.1. PR [#325](https://github.com/fastapi/fastapi-cli/pull/325) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump actions/download-artifact from 7 to 8. PR [#327](https://github.com/fastapi/fastapi-cli/pull/327) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump actions/upload-artifact from 6 to 7. PR [#326](https://github.com/fastapi/fastapi-cli/pull/326) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump fastapi-cloud-cli from 0.13.0 to 0.14.0. PR [#324](https://github.com/fastapi/fastapi-cli/pull/324) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump fastapi from 0.132.0 to 0.133.0. PR [#321](https://github.com/fastapi/fastapi-cli/pull/321) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump rich-toolkit from 0.19.4 to 0.19.7. PR [#322](https://github.com/fastapi/fastapi-cli/pull/322) by [@dependabot[bot]](https://github.com/apps/dependabot).
 

scripts/lint.sh

@@ -4,5 +4,6 @@ set -e
 set -x
 
 mypy src tests
+ty check src tests
 ruff check src tests scripts
 ruff format src tests --check

src/fastapi_cli/cli.py

@@ -25,7 +25,7 @@
 try:
     import uvicorn
 except ImportError:  # pragma: no cover
-    uvicorn = None  # type: ignore[assignment]
+    uvicorn = None  # type: ignore[assignment]  # ty: ignore[invalid-assignment]
 
 
 try:
@@ -39,7 +39,7 @@
 
 
 try:
-    from fastapi_new.cli import (  # type: ignore[import-not-found]
+    from fastapi_new.cli import (  # type: ignore[import-not-found]  # ty: ignore[unresolved-import]
         app as fastapi_new_cli,
     )
 

src/fastapi_cli/config.py

@@ -19,7 +19,7 @@ def _read_pyproject_toml(cls) -> dict[str, Any]:
             return {}
 
         try:
-            import tomllib  # type: ignore[import-not-found, unused-ignore]
+            import tomllib  # type: ignore[import-not-found, unused-ignore]  # ty: ignore[unresolved-import]
         except ImportError:
             try:
                 import tomli as tomllib  # type: ignore[no-redef, import-not-found, unused-ignore]
@@ -30,7 +30,7 @@ def _read_pyproject_toml(cls) -> dict[str, Any]:
         with open(pyproject_path, "rb") as f:
             data = tomllib.load(f)
 
-            return data.get("tool", {}).get("fastapi", {})  # type: ignore
+            return data.get("tool", {}).get("fastapi", {})  # type: ignore[no-any-return]
 
     @classmethod
     def resolve(cls, entrypoint: str | None = None) -> "FastAPIConfig":

src/fastapi_cli/discover.py

@@ -11,7 +11,7 @@
 try:
     from fastapi import FastAPI
 except ImportError:  # pragma: no cover
-    FastAPI = None  # type: ignore[misc, assignment]
+    FastAPI = None  # type: ignore[misc, assignment]  # ty: ignore[invalid-assignment]
 
 
 def get_default_path() -> Path:

tests/test_requirements.py

@@ -18,7 +18,7 @@ def test_no_uvicorn() -> None:
 
     import fastapi_cli.cli
 
-    fastapi_cli.cli.uvicorn = None  # type: ignore[attr-defined, assignment]
+    fastapi_cli.cli.uvicorn = None  # type: ignore[attr-defined, assignment]  # ty: ignore[invalid-assignment]
 
     with changing_dir(assets_path):
         result = runner.invoke(fastapi_cli.cli.app, ["dev", "single_file_app.py"])
@@ -29,15 +29,15 @@ def test_no_uvicorn() -> None:
             in result.exception.args[0]
         )
 
-    fastapi_cli.cli.uvicorn = uvicorn  # type: ignore[attr-defined]
+    fastapi_cli.cli.uvicorn = uvicorn  # type: ignore[attr-defined]  # ty: ignore[invalid-assignment]
 
 
 def test_no_fastapi() -> None:
     from fastapi import FastAPI
 
     import fastapi_cli.discover
 
-    fastapi_cli.discover.FastAPI = None  # type: ignore[attr-defined, assignment]
+    fastapi_cli.discover.FastAPI = None  # type: ignore[attr-defined, assignment]  # ty: ignore[invalid-assignment]
     with changing_dir(assets_path):
         with pytest.raises(FastAPICLIException) as exc_info:
             get_import_data(path=Path("single_file_app.py"))