Fix typing

foamlib/_cases/_async.py

@@ -101,7 +101,7 @@ async def _run(
     async def _rmtree(
         path: Union["os.PathLike[str]", str], ignore_errors: bool = False
     ) -> None:
-        await aioshutil.rmtree(path, ignore_errors=ignore_errors)  # type: ignore [call-arg]
+        await aioshutil.rmtree(path, ignore_errors=ignore_errors)
 
     @staticmethod
     async def _copytree(
@@ -188,7 +188,7 @@ async def restore_0_dir(self) -> None:
     @asynccontextmanager
     async def copy(
         self, dst: Optional[Union["os.PathLike[str]", str]] = None
-    ) -> "AsyncGenerator[Self]":
+    ) -> AsyncGenerator[Self, None]:
         """
         Make a copy of this case.
 
@@ -209,7 +209,7 @@ async def copy(
     @asynccontextmanager
     async def clone(
         self, dst: Optional[Union["os.PathLike[str]", str]] = None
-    ) -> "AsyncGenerator[Self]":
+    ) -> AsyncGenerator[Self, None]:
         """
         Clone this case (make a clean copy).
 

tests/test_cases/test_cavity.py

@@ -14,7 +14,7 @@
 
 
 @pytest.fixture(params=[False, True])
-def cavity(request: pytest.FixtureRequest) -> "Generator[FoamCase]":
+def cavity(request: pytest.FixtureRequest) -> Generator[FoamCase, None, None]:
     tutorials_path = Path(os.environ["FOAM_TUTORIALS"])
     path = tutorials_path / "incompressible" / "icoFoam" / "cavity" / "cavity"
     of11_path = tutorials_path / "incompressibleFluid" / "cavity"

tests/test_cases/test_cavity_async.py

@@ -15,7 +15,7 @@
 
 
 @pytest_asyncio.fixture(params=[False, True])
-async def cavity(request: pytest.FixtureRequest) -> "AsyncGenerator[AsyncFoamCase]":
+async def cavity(request: pytest.FixtureRequest) -> AsyncGenerator[AsyncFoamCase, None]:
     tutorials_path = Path(os.environ["FOAM_TUTORIALS"])
     path = tutorials_path / "incompressible" / "icoFoam" / "cavity" / "cavity"
     of11_path = tutorials_path / "incompressibleFluid" / "cavity"
@@ -74,7 +74,10 @@ async def f(x: Sequence[float]) -> float:
         async with cavity.clone() as clone:
             clone[0]["U"].boundary_field["movingWall"].value = [x[0], 0, 0]
             await clone.run(parallel=False)
-            ret = clone[-1]["U"].boundary_field["movingWall"].value[0]
+            U = clone[-1]["U"].boundary_field["movingWall"].value
+            assert not isinstance(U, (int, float))
+            assert len(U) == 3
+            ret = U[0]
             assert isinstance(ret, (int, float))
             return ret
 

tests/test_cases/test_flange.py

@@ -12,7 +12,7 @@
 
 
 @pytest.fixture
-def flange() -> "Generator[FoamCase]":
+def flange() -> Generator[FoamCase, None, None]:
     tutorials_path = Path(os.environ["FOAM_TUTORIALS"])
     path = tutorials_path / "basic" / "laplacianFoam" / "flange"
     of11_path = tutorials_path / "legacy" / "basic" / "laplacianFoam" / "flange"

tests/test_cases/test_flange_async.py

@@ -13,7 +13,7 @@
 
 
 @pytest_asyncio.fixture(params=[AsyncFoamCase, AsyncSlurmFoamCase])
-async def flange(request: pytest.FixtureRequest) -> "AsyncGenerator[AsyncFoamCase]":
+async def flange(request: pytest.FixtureRequest) -> AsyncGenerator[AsyncFoamCase, None]:
     tutorials_path = Path(os.environ["FOAM_TUTORIALS"])
     path = tutorials_path / "basic" / "laplacianFoam" / "flange"
     of11_path = tutorials_path / "legacy" / "basic" / "laplacianFoam" / "flange"

tests/test_files/test_files.py

@@ -104,7 +104,7 @@ def test_new_field(tmp_path: Path) -> None:
 
 
 @pytest.fixture
-def cavity() -> "Generator[FoamCase]":
+def cavity() -> Generator[FoamCase, None, None]:
     tutorials_path = Path(os.environ["FOAM_TUTORIALS"])
     path = tutorials_path / "incompressible" / "icoFoam" / "cavity" / "cavity"
     of11_path = tutorials_path / "incompressibleFluid" / "cavity"