foamlib 0.6.0__tar.gz → 0.6.2__tar.gz

{foamlib-0.6.0 → foamlib-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.6.0
+Version: 0.6.2
 Summary: A Python interface for interacting with OpenFOAM
 Author-email: "Gabriel S. Gerlero" <ggerlero@cimec.unl.edu.ar>
 Project-URL: Homepage, https://github.com/gerlero/foamlib

{foamlib-0.6.0 → foamlib-0.6.2}/foamlib/__init__.py

@@ -1,6 +1,6 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 from ._cases import (
     AsyncFoamCase,

{foamlib-0.6.0 → foamlib-0.6.2}/foamlib/_cases/_run.py

@@ -177,7 +177,7 @@ class FoamCaseRunBase(FoamCaseBase):
 
         return script
 
-    def __run_script(self, *, parallel: Optional[bool] = None) -> Optional[Path]:
+    def __run_script(self, *, parallel: Optional[bool]) -> Optional[Path]:
         """Return the path to the (All)run script, or None if no run script is found."""
         run = self.path / "run"
         run_parallel = self.path / "run-parallel"
@@ -263,7 +263,7 @@ class FoamCaseRunBase(FoamCaseBase):
 
         return type(self)(dst)
 
-    def _clean_calls(self, *, check: bool = False) -> Generator[Any, None, None]:
+    def _clean_calls(self, *, check: bool) -> Generator[Any, None, None]:
         script_path = self.__clean_script()
 
         if script_path is not None:
@@ -299,10 +299,10 @@ class FoamCaseRunBase(FoamCaseBase):
         self,
         cmd: Optional[Union[Sequence[Union[str, "os.PathLike[str]"]], str]] = None,
         *,
-        parallel: Optional[bool] = None,
-        cpus: Optional[int] = None,
-        check: bool = True,
-        log: bool = True,
+        parallel: Optional[bool],
+        cpus: Optional[int],
+        check: bool,
+        log: bool,
     ) -> Generator[Any, None, None]:
         if cmd is not None:
             if parallel:

{foamlib-0.6.0 → foamlib-0.6.2}/foamlib/_cases/_subprocess.py

@@ -9,9 +9,19 @@ if sys.version_info >= (3, 9):
 else:
     from typing import Mapping, Sequence
 
-CalledProcessError = subprocess.CalledProcessError
 CompletedProcess = subprocess.CompletedProcess
 
+
+class CalledProcessError(subprocess.CalledProcessError):
+    def __str__(self) -> str:
+        if self.stderr:
+            if isinstance(self.stderr, bytes):
+                return super().__str__() + "\n" + self.stderr.decode()
+            elif isinstance(self.stderr, str):
+                return super().__str__() + "\n" + self.stderr
+        return super().__str__()
+
+
 DEVNULL = subprocess.DEVNULL
 PIPE = subprocess.PIPE
 STDOUT = subprocess.STDOUT
@@ -29,14 +39,43 @@ def run_sync(
     if not isinstance(cmd, str) and sys.version_info < (3, 8):
         cmd = [str(arg) for arg in cmd]
 
-    return subprocess.run(
+    proc = subprocess.Popen(
         cmd,
         cwd=cwd,
         env=env,
         stdout=stdout,
-        stderr=stderr,
+        stderr=PIPE,
         shell=isinstance(cmd, str),
-        check=check,
+    )
+
+    error = b""
+
+    if stderr == STDOUT:
+        stderr = stdout
+    if stderr not in (PIPE, DEVNULL):
+        assert not isinstance(stderr, int)
+        if stderr is None:
+            stderr = sys.stderr.buffer
+
+        assert proc.stderr is not None
+        for line in proc.stderr:
+            error += line
+            stderr.write(line)
+
+    output, _ = proc.communicate()
+    assert not _
+    assert proc.returncode is not None
+
+    if check and proc.returncode != 0:
+        raise CalledProcessError(
+            returncode=proc.returncode,
+            cmd=cmd,
+            output=output,
+            stderr=error,
+        )
+
+    return CompletedProcess(
+        cmd, returncode=proc.returncode, stdout=output, stderr=error
     )
 
 
@@ -55,7 +94,7 @@ async def run_async(
             cwd=cwd,
             env=env,
             stdout=stdout,
-            stderr=stderr,
+            stderr=PIPE,
         )
 
     else:
@@ -66,11 +105,25 @@ async def run_async(
             cwd=cwd,
             env=env,
             stdout=stdout,
-            stderr=stderr,
+            stderr=PIPE,
         )
 
-    output, error = await proc.communicate()
+    error = b""
+
+    if stderr == STDOUT:
+        stderr = stdout
+    if stderr not in (PIPE, DEVNULL):
+        assert not isinstance(stderr, int)
+        if stderr is None:
+            stderr = sys.stderr.buffer
+
+        assert proc.stderr is not None
+        async for line in proc.stderr:
+            error += line
+            stderr.write(line)
 
+    output, _ = await proc.communicate()
+    assert not _
     assert proc.returncode is not None
 
     if check and proc.returncode != 0:

{foamlib-0.6.0 → foamlib-0.6.2}/foamlib/_cases/_sync.py

@@ -67,7 +67,7 @@ class FoamCase(FoamCaseRunBase):
     ) -> None:
         shutil.copytree(src, dest, symlinks=symlinks, ignore=ignore)
 
-    def __enter__(self) -> "FoamCase":
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(
@@ -105,7 +105,9 @@ class FoamCase(FoamCaseRunBase):
         :param check: If True, raise a CalledProcessError if any command returns a non-zero exit code.
         :param log: If True, log the command output to a file.
         """
-        for _ in self._run_calls(cmd=cmd, parallel=parallel, check=check):
+        for _ in self._run_calls(
+            cmd=cmd, parallel=parallel, cpus=cpus, check=check, log=log
+        ):
             pass
 
     def block_mesh(self, *, check: bool = True) -> None:

{foamlib-0.6.0 → foamlib-0.6.2}/foamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.6.0
+Version: 0.6.2
 Summary: A Python interface for interacting with OpenFOAM
 Author-email: "Gabriel S. Gerlero" <ggerlero@cimec.unl.edu.ar>
 Project-URL: Homepage, https://github.com/gerlero/foamlib