foamlib 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

foamlib/__init__.py

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

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/_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__(

{foamlib-0.6.0.dist-info → foamlib-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.6.0
+Version: 0.6.1
 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.dist-info → foamlib-0.6.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-foamlib/__init__.py,sha256=Qg1zNl1cgh7eMuYuDmUROom5krkuBVijkBu6M4m44No,392
+foamlib/__init__.py,sha256=BVCe7vPVevu5BHTZMwbL8VQEQCStIT_j_p_4bGfVW1A,392
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=C0mpRu7c-X-4uVMKmVrZhwIyhBNyvUoCv0o-BQ72RC0,236
 foamlib/_cases/_async.py,sha256=8x8Mkql6XPzMjH4t-NszAEDx4gpjNPnQiWxFkHrcFJU,6436
 foamlib/_cases/_base.py,sha256=1CUkkK4afBxDgP79dmho97WJdj-GLgYhnrCSf_52Eao,6604
 foamlib/_cases/_run.py,sha256=0xu5V3qvWnXYJvOh0GV8DM1gOiNc65frWJF3mviHPOM,12307
-foamlib/_cases/_subprocess.py,sha256=CfUy_LrqLnMLR9FHINqInCd3soN6eYvonwZ30epiLu8,2234
-foamlib/_cases/_sync.py,sha256=BqEA-EE5JltOGwisAOeTM8kqawWqw33y0Ze92TZe6KQ,4758
+foamlib/_cases/_subprocess.py,sha256=GTmHWy1LRD9ujpXJfSTXU2bf87GncpIA0VOR1rQW2fg,3633
+foamlib/_cases/_sync.py,sha256=PzwciC4kFfenlG0XOtbBMxd9EuQBChwxZGA3RDlmWXM,4752
 foamlib/_cases/_util.py,sha256=GNndpqw3Jg_S-Hxzl5vwRgD0czcTNb9NYHMhcfBoMBg,1493
 foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
 foamlib/_files/_base.py,sha256=zaFDjLE6jB7WtGWk8hfKusjLtlGu6CZV16AHJpRUibs,1929
@@ -14,8 +14,8 @@ foamlib/_files/_io.py,sha256=uSh5XlgukwJkQSLELa4mshRD2aTajNk5vr_ZsBImSeU,2423
 foamlib/_files/_parsing.py,sha256=DzgJ53QnohRQyLXn2zOs52RIQ7bJ_fS_S2Z7rmRyVK4,9023
 foamlib/_files/_serialization.py,sha256=pb8_cIVgRhGS_ZV2p3x8p5_lK1SS6xzQHscAYYuOgFY,3407
 foamlib/_files/_util.py,sha256=UMzXmTFgvbp46w6k3oEZJoYC98pFgEK6LN5uLOwrlCg,397
-foamlib-0.6.0.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.6.0.dist-info/METADATA,sha256=IR3vRgU_77iKtMM_PiKdeGZIHi8EczgdhBbEsUF6dpE,6338
-foamlib-0.6.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-foamlib-0.6.0.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.6.0.dist-info/RECORD,,
+foamlib-0.6.1.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.6.1.dist-info/METADATA,sha256=wCN0T5tNyAtSUx5k8ehwqjX05fJDV_vBbw4j-pTqNbI,6338
+foamlib-0.6.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+foamlib-0.6.1.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.6.1.dist-info/RECORD,,