foamlib 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

foamlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.4"
+__version__ = "0.2.5"
 
 from ._cases import FoamCase, AsyncFoamCase, FoamCaseBase
 from ._dictionaries import FoamFile, FoamFieldFile, FoamDictionaryBase

foamlib/_cases.py

@@ -1,3 +1,4 @@
+import sys
 import os
 import asyncio
 import multiprocessing
@@ -8,19 +9,26 @@ from contextlib import asynccontextmanager
 from typing import (
     Optional,
     Union,
-    Collection,
-    Mapping,
-    Set,
-    Sequence,
-    AsyncGenerator,
-    Callable,
-    Iterator,
     overload,
 )
 
+if sys.version_info >= (3, 9):
+    from collections.abc import (
+        Collection,
+        Mapping,
+        Set,
+        Sequence,
+        AsyncGenerator,
+        Callable,
+        Iterator,
+    )
+else:
+    from typing import Collection, Mapping, Sequence, AsyncGenerator, Callable, Iterator
+    from typing import AbstractSet as Set
+
 import aioshutil
 
-from ._subprocesses import run_process, run_process_async, CalledProcessError
+from ._util import is_sequence, run_process, run_process_async, CalledProcessError
 from ._dictionaries import FoamFile, FoamFieldFile
 
 
@@ -132,7 +140,7 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
         has_decompose_par_dict = (self.path / "system" / "decomposeParDict").is_file()
         has_block_mesh_dict = (self.path / "system" / "blockMeshDict").is_file()
 
-        paths: Set[Path] = set()
+        paths = set()
 
         for p in self.path.iterdir():
             if p.is_dir():
@@ -215,7 +223,7 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
     def _parallel_cmd(
         self, cmd: Union[Sequence[Union[str, Path]], str, Path]
     ) -> Union[Sequence[Union[str, Path]], str]:
-        if isinstance(cmd, str) or not isinstance(cmd, Sequence):
+        if not is_sequence(cmd):
             return f"mpiexec -np {self._nprocessors} {cmd} -parallel"
         else:
             return [

foamlib/_dictionaries/_base.py

@@ -1,6 +1,13 @@
+import sys
+
 from abc import abstractmethod
 from dataclasses import dataclass
-from typing import Dict, NamedTuple, Optional, Sequence, Union
+from typing import Dict, NamedTuple, Optional, Union
+
+if sys.version_info >= (3, 9):
+    from collections.abc import Sequence
+else:
+    from typing import Sequence
 
 
 class FoamDictionaryBase:

foamlib/_dictionaries/_files.py

@@ -1,21 +1,23 @@
+import sys
+
 from pathlib import Path
 from typing import (
     Any,
-    Iterator,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
     Tuple,
     Union,
     cast,
 )
 
-from typing_extensions import Self
+if sys.version_info >= (3, 9):
+    from collections.abc import Iterator, Mapping, MutableMapping, Sequence
+else:
+    from typing import Iterator, Mapping, MutableMapping, Sequence
 
-from ._base import FoamDictionaryBase
-from ._parsing import Parsed, as_dict, get_entry_locn, get_value, parse
-from ._serialization import serialize_entry
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 try:
     import numpy as np
@@ -23,6 +25,10 @@ try:
 except ModuleNotFoundError:
     pass
 
+from ._base import FoamDictionaryBase
+from ._parsing import Parsed, as_dict, get_entry_locn, get_value, parse
+from ._serialization import serialize_entry
+
 
 class _FoamFileBase:
     def __init__(self, path: Union[str, Path]) -> None:

foamlib/_dictionaries/_parsing.py

@@ -1,4 +1,11 @@
-from typing import Mapping, MutableMapping, Optional, Sequence, Tuple
+import sys
+
+from typing import Optional, Tuple
+
+if sys.version_info >= (3, 9):
+    from collections.abc import Mapping, MutableMapping, Sequence
+else:
+    from typing import Mapping, MutableMapping, Sequence
 
 from pyparsing import (
     Dict,
@@ -163,7 +170,6 @@ def as_dict(parsed: Parsed) -> FoamDictionaryBase._Dict:
     """
     ret: FoamDictionaryBase._Dict = {}
     for keywords, (_, value, _) in parsed.items():
-
         r = ret
         for k in keywords[:-1]:
             assert isinstance(r, dict)

foamlib/_dictionaries/_serialization.py

@@ -1,23 +1,15 @@
-from contextlib import suppress
-from typing import Any, Mapping, Sequence
+import sys
 
-from ._base import FoamDictionaryBase
+from contextlib import suppress
+from typing import Any
 
-try:
-    import numpy as np
-except ModuleNotFoundError:
-    numpy = False
+if sys.version_info >= (3, 9):
+    from collections.abc import Mapping
 else:
-    numpy = True
+    from typing import Mapping
 
-
-def _is_sequence(value: Any) -> bool:
-    return (
-        isinstance(value, Sequence)
-        and not isinstance(value, str)
-        or numpy
-        and isinstance(value, np.ndarray)
-    )
+from ._base import FoamDictionaryBase
+from .._util import is_sequence
 
 
 def _serialize_bool(value: Any) -> str:
@@ -30,14 +22,14 @@ def _serialize_bool(value: Any) -> str:
 
 
 def _serialize_list(value: Any) -> str:
-    if _is_sequence(value):
+    if is_sequence(value):
         return f"({' '.join(_serialize_value(v) for v in value)})"
     else:
         raise TypeError(f"Not a valid sequence: {type(value)}")
 
 
 def _serialize_field(value: Any) -> str:
-    if _is_sequence(value):
+    if is_sequence(value):
         try:
             s = _serialize_list(value)
         except TypeError:
@@ -64,7 +56,7 @@ def _serialize_field(value: Any) -> str:
 
 
 def _serialize_dimensions(value: Any) -> str:
-    if _is_sequence(value) and len(value) == 7:
+    if is_sequence(value) and len(value) == 7:
         return f"[{' '.join(str(v) for v in value)}]"
     else:
         raise TypeError(f"Not a valid dimension set: {type(value)}")

foamlib/{_subprocesses.py → _util.py}

@@ -1,12 +1,40 @@
 import asyncio
 import sys
+import subprocess
 
 from pathlib import Path
-from typing import Union, Sequence, Mapping
-import subprocess
-from subprocess import CalledProcessError
+from typing import Any, Union
+
+if sys.version_info >= (3, 9):
+    from collections.abc import Mapping, Sequence
+else:
+    from typing import Mapping, Sequence
+
+if sys.version_info >= (3, 10):
+    from typing import TypeGuard
+else:
+    from typing_extensions import TypeGuard
+
+try:
+    import numpy as np
+except ModuleNotFoundError:
+    numpy = False
+else:
+    numpy = True
+
+
+def is_sequence(
+    value: Any,
+) -> TypeGuard[Union["Sequence[Any]", "np.ndarray[Any, Any]"]]:
+    return (
+        isinstance(value, Sequence)
+        and not isinstance(value, str)
+        or numpy
+        and isinstance(value, np.ndarray)
+    )
+
 
-__all__ = ["run_process", "run_process_async", "CalledProcessError"]
+CalledProcessError = subprocess.CalledProcessError
 
 
 def run_process(
@@ -16,7 +44,7 @@ def run_process(
     cwd: Union[None, str, Path] = None,
     env: Union[None, Mapping[str, str]] = None,
 ) -> "subprocess.CompletedProcess[bytes]":
-    shell = isinstance(cmd, str) or not isinstance(cmd, Sequence)
+    shell = not is_sequence(cmd)
 
     if sys.version_info < (3, 8):
         if shell:
@@ -28,8 +56,7 @@ def run_process(
         cmd,
         cwd=cwd,
         env=env,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
         shell=shell,
         check=check,
     )
@@ -44,7 +71,7 @@ async def run_process_async(
     cwd: Union[None, str, Path] = None,
     env: Union[None, Mapping[str, str]] = None,
 ) -> "subprocess.CompletedProcess[bytes]":
-    if isinstance(cmd, str) or not isinstance(cmd, Sequence):
+    if not is_sequence(cmd):
         proc = await asyncio.create_subprocess_shell(
             str(cmd),
             cwd=cwd,

{foamlib-0.2.4.dist-info → foamlib-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.2.4
+Version: 0.2.5
 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
@@ -27,24 +27,23 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aioshutil <2,>=1
 Requires-Dist: pyparsing <4,>=3
-Requires-Dist: typing-extensions <5,>=4
+Requires-Dist: typing-extensions <5,>=4 ; python_version < "3.11"
 Provides-Extra: docs
 Requires-Dist: sphinx <8,>=7 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
 Requires-Dist: numpy <2,>=1 ; extra == 'docs'
 Provides-Extra: lint
-Requires-Dist: mypy <2,>=1 ; extra == 'lint'
-Requires-Dist: pytest <9,>=7 ; extra == 'lint'
-Requires-Dist: pytest-asyncio <0.24,>=0.21 ; extra == 'lint'
-Requires-Dist: numpy <2,>=1 ; extra == 'lint'
-Requires-Dist: black ; extra == 'lint'
-Requires-Dist: flake8 ; extra == 'lint'
-Requires-Dist: Flake8-pyproject ; extra == 'lint'
+Requires-Dist: ruff ; extra == 'lint'
 Provides-Extra: test
 Requires-Dist: pytest <9,>=7 ; extra == 'test'
 Requires-Dist: pytest-asyncio <0.24,>=0.21 ; extra == 'test'
 Requires-Dist: pytest-cov ; extra == 'test'
 Requires-Dist: numpy <2,>=1 ; extra == 'test'
+Provides-Extra: typing
+Requires-Dist: mypy <2,>=1 ; extra == 'typing'
+Requires-Dist: pytest <9,>=7 ; extra == 'typing'
+Requires-Dist: pytest-asyncio <0.24,>=0.21 ; extra == 'typing'
+Requires-Dist: numpy <2,>=1 ; extra == 'typing'
 
 # foamlib
 
@@ -52,7 +51,7 @@ Requires-Dist: numpy <2,>=1 ; extra == 'test'
 [![CI](https://github.com/gerlero/foamlib/actions/workflows/ci.yml/badge.svg)](https://github.com/gerlero/foamlib/actions/workflows/ci.yml)
 [![Codecov](https://codecov.io/gh/gerlero/foamlib/branch/main/graph/badge.svg)](https://codecov.io/gh/gerlero/foamlib)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![PyPI](https://img.shields.io/pypi/v/foamlib)](https://pypi.org/project/foamlib/)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/foamlib)](https://pypi.org/project/foamlib/)
 [![Docker image](https://img.shields.io/badge/docker%20image-gerlero%2Ffoamlib-informational)](https://hub.docker.com/r/gerlero/foamlib/)

foamlib-0.2.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+foamlib/__init__.py,sha256=ncl1G6iN85s3zP7aVBqzekY5wHCoOn8dpJxXW2e36vI,287
+foamlib/_cases.py,sha256=SbMaaKdhYbgmgdxWZNB7j47P04QxZ3VVq4sP9HbTLpA,21422
+foamlib/_util.py,sha256=ICs_Bc2jXpxzOUos6Cnl0blUwz1P6r1f1swP8k9Bex0,2347
+foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+foamlib/_dictionaries/__init__.py,sha256=6UWBGe1t7cq-d6WWQrVm0Xpi7Whpkr-mkTWgAM4NwcE,160
+foamlib/_dictionaries/_base.py,sha256=0Qic347JzJBMgBc0gHfuAGmQMWYGEn7IfJ9vKd4pm_I,1606
+foamlib/_dictionaries/_files.py,sha256=Qyw04I5hqGRkHR7KWGmMdX6LyVtat1zKf50bo7CRIoU,12626
+foamlib/_dictionaries/_parsing.py,sha256=w7AOyoPPghsG06WK_1fXU-udU_F8J_zuvV9eIf07P8M,4905
+foamlib/_dictionaries/_serialization.py,sha256=8YInaQ0HnlDe4RnwocvTlJJkVFR7XDqGsuN4ABAyUCE,3452
+foamlib-0.2.5.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.2.5.dist-info/METADATA,sha256=PuzWIZKasSyaUKpO0H_g67r6wqLyswQyOzzelaiHLpQ,4650
+foamlib-0.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foamlib-0.2.5.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.2.5.dist-info/RECORD,,

foamlib-0.2.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-foamlib/__init__.py,sha256=BPC3la1UvhtGOS7utfBE5tccqz8mxqzd7Fn0zFC5yz0,287
-foamlib/_cases.py,sha256=4f3c5BXnsHPhFvgXNjUcGGHyu7I0WZT6zxlvGhb9kMY,21213
-foamlib/_subprocesses.py,sha256=5vqdQvpN_2v4GgDqxi-s88NGhZ6doFxkh0XY89ZWuHA,1926
-foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foamlib/_dictionaries/__init__.py,sha256=6UWBGe1t7cq-d6WWQrVm0Xpi7Whpkr-mkTWgAM4NwcE,160
-foamlib/_dictionaries/_base.py,sha256=H8XfiaX1LD6OWwZ9m61SaKgI-_szF1udyEfiLurrCB8,1493
-foamlib/_dictionaries/_files.py,sha256=1Ve1FG2VVKLyj6yZGe4Vy8EhEOtyORQtJMUK-cbPNt4,12424
-foamlib/_dictionaries/_parsing.py,sha256=65kwMU6b4WmMngOR5ED8IBvMa59FQqTRmd9o0xPnWJM,4768
-foamlib/_dictionaries/_serialization.py,sha256=viHpQKggSBfxq9V6veVcCCLNq7wdJ-2g5maecaN2beU,3612
-foamlib-0.2.4.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.2.4.dist-info/METADATA,sha256=Z5aFcGYwPssHy9DTrQqZ4Lsw6cJ1QjW9UFiqe0Uuf58,4640
-foamlib-0.2.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foamlib-0.2.4.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.2.4.dist-info/RECORD,,