foamlib 0.3.10__tar.gz → 0.3.11__tar.gz

{foamlib-0.3.10 → foamlib-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.3.10
+Version: 0.3.11
 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
@@ -29,7 +29,7 @@ Requires-Dist: aioshutil<2,>=1
 Requires-Dist: pyparsing<4,>=3
 Requires-Dist: typing-extensions<5,>=4; python_version < "3.11"
 Provides-Extra: numpy
-Requires-Dist: numpy<2,>=1; extra == "numpy"
+Requires-Dist: numpy<3,>=1; extra == "numpy"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: test

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib/__init__.py

@@ -1,6 +1,6 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.3.10"
+__version__ = "0.3.11"
 
 from ._cases import AsyncFoamCase, FoamCase, FoamCaseBase
 from ._files import FoamDict, FoamFieldFile, FoamFile

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib/_cases.py

@@ -498,7 +498,7 @@ class AsyncFoamCase(FoamCaseBase):
         else:
             for p in self._clean_paths():
                 if p.is_dir():
-                    await aioshutil.rmtree(p)
+                    await aioshutil.rmtree(p)  # type: ignore [call-arg]
                 else:
                     p.unlink()
 
@@ -599,7 +599,7 @@ class AsyncFoamCase(FoamCaseBase):
 
     async def restore_0_dir(self) -> None:
         """Restore the 0 directory from the 0.orig directory."""
-        await aioshutil.rmtree(self.path / "0", ignore_errors=True)
+        await aioshutil.rmtree(self.path / "0", ignore_errors=True)  # type: ignore [call-arg]
         await aioshutil.copytree(self.path / "0.orig", self.path / "0")
 
     async def copy(self, dest: Union[Path, str]) -> "AsyncFoamCase":

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib/_files/_parsing.py

@@ -54,11 +54,10 @@ def _list_of(entry: ParserElement) -> ParserElement:
     )
 
 
-def _dictionary_of(
+def _keyword_entry_of(
     keyword: ParserElement,
     data_entries: ParserElement,
     *,
-    len: Union[int, EllipsisType] = ...,
     located: bool = False,
 ) -> ParserElement:
     subdict = Forward()
@@ -73,7 +72,7 @@ def _dictionary_of(
 
     subdict <<= Dict(Group(keyword_entry)[...], asdict=not located)
 
-    return Dict(Group(keyword_entry)[len], asdict=not located)
+    return keyword_entry
 
 
 _binary_contents = Forward()
@@ -146,7 +145,7 @@ _FIELD = (
 )
 _TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
 _DATA = Forward()
-_KEYWORD_ENTRY = _dictionary_of(_TOKEN, _DATA, len=1)
+_KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(_TOKEN, _DATA)), asdict=True)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
@@ -159,7 +158,19 @@ _DATA <<= _DATA_ENTRY[1, ...].set_parse_action(
 )
 
 _FILE = (
-    _dictionary_of(_TOKEN, Opt(_DATA, default=""), located=True)
+    Dict(
+        Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+        + Opt(
+            Group(
+                Located(
+                    _DATA_ENTRY[1, ...].set_parse_action(
+                        lambda tks: ["", tuple(tks) if len(tks) > 1 else tks[0]]
+                    )
+                )
+            )
+        )
+        + Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+    )
     .ignore(c_style_comment)
     .ignore(cpp_style_comment)
     .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
@@ -203,8 +214,11 @@ class Parsed(Mapping[Tuple[str, ...], Union[FoamDict.Data, EllipsisType]]):
         return ret
 
     def __getitem__(
-        self, keywords: Tuple[str, ...]
+        self, keywords: Union[str, Tuple[str, ...]]
     ) -> Union[FoamDict.Data, EllipsisType]:
+        if isinstance(keywords, str):
+            keywords = (keywords,)
+
         _, data, _ = self._parsed[keywords]
         return data
 

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib/_files/_serialization.py

@@ -39,12 +39,14 @@ def dumpb(
         entries = []
         for k, v in data.items():
             b = dumpb(v, kind=kind)
-            if isinstance(v, Mapping):
+            if not k:
+                entries.append(b)
+            elif isinstance(v, Mapping):
                 entries.append(dumpb(k) + b"\n" + b"{\n" + b + b"\n}")
-            elif b:
-                entries.append(dumpb(k) + b" " + b + b";")
-            else:
+            elif not b:
                 entries.append(dumpb(k) + b";")
+            else:
+                entries.append(dumpb(k) + b" " + b + b";")
 
         return b"\n".join(entries)
 

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.3.10
+Version: 0.3.11
 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
@@ -29,7 +29,7 @@ Requires-Dist: aioshutil<2,>=1
 Requires-Dist: pyparsing<4,>=3
 Requires-Dist: typing-extensions<5,>=4; python_version < "3.11"
 Provides-Extra: numpy
-Requires-Dist: numpy<2,>=1; extra == "numpy"
+Requires-Dist: numpy<3,>=1; extra == "numpy"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: test

{foamlib-0.3.10 → foamlib-0.3.11}/foamlib.egg-info/requires.txt

@@ -20,7 +20,7 @@ sphinx_rtd_theme
 ruff
 
 [numpy]
-numpy<2,>=1
+numpy<3,>=1
 
 [test]
 foamlib[numpy]

{foamlib-0.3.10 → foamlib-0.3.11}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
-numpy = ["numpy>=1,<2"]
+numpy = ["numpy>=1,<3"]
 lint = ["ruff"]
 test = [
     "foamlib[numpy]",