foamlib 0.8.10__tar.gz → 0.8.11__tar.gz

{foamlib-0.8.10 → foamlib-0.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foamlib
-Version: 0.8.10
+Version: 0.8.11
 Summary: A Python interface for interacting with OpenFOAM
 Project-URL: Homepage, https://github.com/gerlero/foamlib
 Project-URL: Repository, https://github.com/gerlero/foamlib
@@ -30,35 +30,10 @@ Requires-Dist: numpy<3,>=1
 Requires-Dist: pyparsing<4,>=3.1.2
 Requires-Dist: rich<15,>=13
 Requires-Dist: typing-extensions<5,>=4; python_version < '3.11'
-Provides-Extra: dev
-Requires-Dist: mypy<2,>=1; extra == 'dev'
-Requires-Dist: pytest-asyncio<0.27,>=0.21; extra == 'dev'
-Requires-Dist: pytest-cov; extra == 'dev'
-Requires-Dist: pytest<9,>=7; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
-Requires-Dist: scipy-stubs; (python_version >= '3.10') and extra == 'dev'
-Requires-Dist: scipy<2,>=1; extra == 'dev'
-Requires-Dist: sphinx-rtd-theme; extra == 'dev'
-Requires-Dist: sphinx<9,>=5; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: ruff; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; extra == 'docs'
 Requires-Dist: sphinx<9,>=5; extra == 'docs'
-Provides-Extra: lint
-Requires-Dist: ruff; extra == 'lint'
-Provides-Extra: test
-Requires-Dist: mypy<2,>=1; extra == 'test'
-Requires-Dist: pytest-asyncio<0.27,>=0.21; extra == 'test'
-Requires-Dist: pytest-cov; extra == 'test'
-Requires-Dist: pytest<9,>=7; extra == 'test'
-Requires-Dist: scipy<2,>=1; extra == 'test'
-Provides-Extra: typing
-Requires-Dist: mypy<2,>=1; extra == 'typing'
-Requires-Dist: pytest-asyncio<0.27,>=0.21; extra == 'typing'
-Requires-Dist: pytest-cov; extra == 'typing'
-Requires-Dist: pytest<9,>=7; extra == 'typing'
-Requires-Dist: scipy-stubs; (python_version >= '3.10') and extra == 'typing'
-Requires-Dist: scipy<2,>=1; extra == 'typing'
 Description-Content-Type: text/markdown
 
 [<img alt="foamlib" src="https://github.com/gerlero/foamlib/raw/main/logo.png" height="65">](https://github.com/gerlero/foamlib)

{foamlib-0.8.10 → foamlib-0.8.11}/foamlib/__init__.py

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

{foamlib-0.8.10 → foamlib-0.8.11}/foamlib/_files/_parsing.py

@@ -115,6 +115,10 @@ def _tensor_list(
         rf"\((?:{ignore_pattern})?(?:{tensor.re.pattern}{ignore_pattern})*{tensor.re.pattern}(?:{ignore_pattern})?\)"
     ).add_parse_action(
         lambda tks: [_parse_ascii_field(tks[0], tensor_kind, ignore=ignore)]
+    ) | (
+        (Literal("(") + Literal(")"))
+        .suppress()
+        .add_parse_action(lambda: np.array([]).reshape(0, *tensor_kind.shape))
     )
 
     def count_parse_action(tks: ParseResults) -> None:
@@ -122,6 +126,14 @@ def _tensor_list(
         length = tks[0]
         assert isinstance(length, int)
 
+        if not length:
+            list_ <<= (
+                ((Literal("(") + Literal(")")) | (Literal("{") + Literal("}")))
+                .suppress()
+                .add_parse_action(lambda: np.array([]).reshape(0, *tensor_kind.shape))
+            )
+            return
+
         list_ <<= (
             Regex(
                 rf"\((?:{ignore_pattern})?(?:{tensor.re.pattern}{ignore_pattern}){{{length - 1}}}{tensor.re.pattern}(?:{ignore_pattern})?\)"

{foamlib-0.8.10 → foamlib-0.8.11}/pyproject.toml

@@ -39,36 +39,34 @@ dependencies = [
 dynamic = ["version"]
 
 [dependency-groups]
-dev = ["foamlib[dev]"]
-lint = ["foamlib[lint]"]
-test = ["foamlib[test]"]
-typing = ["foamlib[typing]"]
-docs = ["foamlib[docs]"]
-
-[project.optional-dependencies]
 lint = ["ruff"]
-test = [
+typing = [
     "mypy>=1,<2",
+    "scipy-stubs; python_version>='3.10'",
+]
+test = [
     "pytest>=7,<9",
     "pytest-asyncio>=0.21,<0.27",
     "pytest-cov",
     "scipy>=1,<2",
 ]
-typing = [
-    "foamlib[test]",
-    "mypy>=1,<2",
-    "scipy-stubs; python_version>='3.10'",
-]
 docs = [
     "ruff",
     "sphinx>=5,<9",
     "sphinx_rtd_theme",
 ]
 dev = [
-    "foamlib[lint]",
-    "foamlib[test]",
-    "foamlib[typing]",
-    "foamlib[docs]",
+    {include-group = "lint"},
+    {include-group = "typing"},
+    {include-group = "test"},
+    {include-group = "docs"},
+]
+
+[project.optional-dependencies]
+docs = [
+    "ruff",
+    "sphinx>=5,<9",
+    "sphinx_rtd_theme",
 ]
 
 [project.urls]
@@ -80,7 +78,10 @@ Documentation = "https://foamlib.readthedocs.io"
 path = "foamlib/__init__.py"
 
 [tool.mypy]
-packages = ["foamlib"]
+packages = [
+    "foamlib",
+    "tests",
+]
 strict = true
 
 [tool.ruff.lint]

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_advanced.py

@@ -1,6 +1,5 @@
 # Based on https://foss.heptapod.net/fluiddyn/fluidsimfoam/-/blob/branch/default/tests/test_parser_advanced.py
 
-import numpy as np
 import pytest
 from foamlib._files._parsing import Parsed
 
@@ -17,10 +16,10 @@ def test_dict_strange_name() -> None:
     """
     )
     assert parsed[
-        (("div(phi,ft_b_ha_hau)", "Gauss", "multivariateSelection"), "ft")
+        (("div(phi,ft_b_ha_hau)", "Gauss", "multivariateSelection"), "ft")  # type: ignore[index]
     ] == ("limitedLinear01", 1)
     assert parsed[
-        (("div(phi,ft_b_ha_hau)", "Gauss", "multivariateSelection"), "b")
+        (("div(phi,ft_b_ha_hau)", "Gauss", "multivariateSelection"), "b")  # type: ignore[index]
     ] == ("limitedLinear01", 1)
 
 
@@ -263,7 +262,7 @@ def test_list_triple_named() -> None:
         """
     )
     assert parsed[("velocity-inlet-5", "type")] == "fixedValue"
-    assert np.allclose(parsed[("velocity-inlet-5", "value")], [1, 0, 0])
+    assert parsed[("velocity-inlet-5", "value")] == pytest.approx([1, 0, 0])
 
 
 def test_assignment_strange_name() -> None:
@@ -356,9 +355,9 @@ def test_list_as_write_cell_centers() -> None:
         );
         """
     )
-    assert np.allclose(parsed[("value",)], [47.619, 142.857])
+    assert parsed[("value",)] == pytest.approx([47.619, 142.857])
 
 
 def test_list_as_write_cell_centers_short() -> None:
     parsed = Parsed(b"value           nonuniform List<scalar> 4(250 750 1250 1750);")
-    assert np.allclose(parsed[("value",)], [250, 750, 1250, 1750])
+    assert parsed[("value",)] == pytest.approx([250, 750, 1250, 1750])

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_basic.py

@@ -26,6 +26,12 @@ def test_parse_value() -> None:
     field = Parsed(b"nonuniform List<scalar> 2{1}")[()]
     assert isinstance(field, np.ndarray)
     assert np.array_equal(field, [1, 1])
+    field = Parsed(b"nonuniform List<symmTensor> 0()")[()]
+    assert isinstance(field, np.ndarray)
+    assert field.shape == (0, 6)
+    field = Parsed(b"nonuniform List<tensor> ()")[()]
+    assert isinstance(field, np.ndarray)
+    assert field.shape == (0, 9)
     assert Parsed(b"3(1 2 3)")[()] == [1, 2, 3]
     assert Parsed(b"2((1 2 3) (4 5 6))")[()] == [
         [1, 2, 3],

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_decompose_par.py

@@ -43,9 +43,9 @@ def test_simple(tmp_path: Path) -> None:
 
     assert decompose_par_dict["numberOfSubdomains"] == 8
     assert decompose_par_dict["method"] == "simple"
-    assert decompose_par_dict["coeffs"]["n"] == [4, 2, 1]
-    assert decompose_par_dict["coeffs"]["order"] == "xyz"
-    assert decompose_par_dict["coeffs"]["delta"] == 0.001
+    assert decompose_par_dict["coeffs", "n"] == [4, 2, 1]
+    assert decompose_par_dict["coeffs", "order"] == "xyz"
+    assert decompose_par_dict["coeffs", "delta"] == 0.001
 
 
 def test_scotch(tmp_path: Path) -> None:

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_fields.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from textwrap import dedent
 
 import numpy as np
+import pytest
 from foamlib import FoamFieldFile
 
 code_p = dedent(
@@ -79,8 +80,9 @@ def test_nut(tmp_path: Path) -> None:
 
     assert field.dimensions == FoamFieldFile.DimensionSet(length=2, time=-1)
     assert field.internal_field == 0
-    assert field.boundary_field["wall"]["type"] == "nutkWallFunction"
-    assert field.boundary_field["wall"]["value"] == "$internalField"
+    assert isinstance(field.boundary_field["wall"], FoamFieldFile.BoundarySubDict)
+    assert field.boundary_field["wall"].type == "nutkWallFunction"
+    assert field.boundary_field["wall"].value == "$internalField"
     assert field.boundary_field["#includeEtc"] == '"caseDicts/setConstraintTypes"'
 
 
@@ -282,7 +284,7 @@ code_cx = dedent(
 )
 
 
-def test_cells_centers(tmp_path: Path) -> None:
+def test_cell_centers(tmp_path: Path) -> None:
     """Data obtained with `postProcess -func writeCellCentres`
 
     https://www.openfoam.com/documentation/guides/latest/doc/guide-fos-field-writeCellCentres.html
@@ -299,4 +301,5 @@ def test_cells_centers(tmp_path: Path) -> None:
     assert field_c.dimensions == FoamFieldFile.DimensionSet(length=1)
     assert field_cx.dimensions == FoamFieldFile.DimensionSet(length=1)
 
-    assert np.allclose(field_c.internal_field[:, 0], field_cx.internal_field)
+    assert isinstance(field_c.internal_field, np.ndarray)
+    assert field_c.internal_field[:, 0] == pytest.approx(field_cx.internal_field)

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_fv_schemes.py

@@ -59,14 +59,14 @@ def test_simple(tmp_path: Path) -> None:
 
     fv_schemes = FoamFile(path)
 
-    assert fv_schemes["ddtSchemes"]["default"] == "Euler"
+    assert fv_schemes["ddtSchemes", "default"] == "Euler"
     assert not fv_schemes["gradSchemes"]
-    assert fv_schemes["divSchemes"]["div(phi,T)"] == ("Gauss", "limitedLinear", 1)
-    assert fv_schemes["divSchemes"]["div(phi,U)"] == "foo"
-    assert fv_schemes["divSchemes"]["div(phi.b,k.b)"] == ("Gauss", "limitedLinear", 1)
-    assert fv_schemes["divSchemes"]["div(phi,k)"] == "$turbulence"
+    assert fv_schemes["divSchemes", "div(phi,T)"] == ("Gauss", "limitedLinear", 1)
+    assert fv_schemes["divSchemes", "div(phi,U)"] == "foo"
+    assert fv_schemes["divSchemes", "div(phi.b,k.b)"] == ("Gauss", "limitedLinear", 1)
+    assert fv_schemes["divSchemes", "div(phi,k)"] == "$turbulence"
     assert not fv_schemes["laplacianSchemes"]
     assert not fv_schemes["interpolationSchemes"]
     assert not fv_schemes["snGradSchemes"]
-    assert fv_schemes["fluxRequired"]["default"] is False
-    assert fv_schemes["fluxRequired"]["p_rbgh"] == ""
+    assert fv_schemes["fluxRequired", "default"] is False
+    assert fv_schemes["fluxRequired", "p_rbgh"] == ""

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_intermediate.py

@@ -1,6 +1,5 @@
 # Based on https://foss.heptapod.net/fluiddyn/fluidsimfoam/-/blob/branch/default/tests/test_parser.py
 
-import numpy as np
 import pytest
 from foamlib import FoamFile
 from foamlib._files._parsing import Parsed
@@ -383,8 +382,11 @@ def test_dimension_set() -> None:
         }
     """)
     assert parsed[("dimensions",)] == FoamFile.DimensionSet(length=2, time=-1)
+    assert isinstance(parsed[("nu",)], FoamFile.Dimensioned)
     assert parsed[("nu",)].dimensions == FoamFile.DimensionSet(length=2, time=-1)
+    assert isinstance(parsed[("nu1",)], FoamFile.Dimensioned)
     assert parsed[("nu1",)].dimensions == FoamFile.DimensionSet(length=2, time=-1)
+    assert isinstance(parsed[("SIMPLE", "rhoMin")], FoamFile.Dimensioned)
     assert parsed[("SIMPLE", "rhoMin")].dimensions == FoamFile.DimensionSet(
         mass=1, length=-3
     )
@@ -715,4 +717,4 @@ def test_list_uniform() -> None:
             );
         """)
     assert parsed[("a",)] == 1
-    assert np.allclose(parsed[("internalField",)], [0.1, 0, 0])
+    assert parsed[("internalField",)] == pytest.approx([0.1, 0, 0])

{foamlib-0.8.10 → foamlib-0.8.11}/tests/test_files/test_parsing/test_poly_mesh.py

@@ -1,6 +1,5 @@
 # Based on https://foss.heptapod.net/fluiddyn/fluidsimfoam/-/blob/branch/default/tests/test_polymesh.py
 
-
 from pathlib import Path
 
 from foamlib import FoamFile
@@ -47,20 +46,23 @@ def test_get_cells_coords(tmp_path: Path) -> None:
     path = tmp_path / "points"
     path.write_text(contents)
 
-    points = FoamFile(path)
+    file = FoamFile(path)
+
+    points = file[None]
+    assert isinstance(points, list)
 
-    assert points[None][0] == [0, 0, 0]
-    assert points[None][1] == [0.15707963268, 0, 0]
-    assert points[None][2] == [0.314159265359, 0, 0]
-    assert points[None][3] == [0.471238898038, 0, 0]
-    assert points[None][4] == [0.628318530718, 0, 0]
-    assert points[None][5] == [0, 0, 0]
-    assert points[None][6] == [0.15707963268, 0, 0]
-    assert points[None][7] == [0.314159265359, 0, 0]
-    assert points[None][8] == [0.471238898038, 0, 0]
-    assert points[None][9] == [0.628318530718, 0, 0]
+    assert points[0] == [0, 0, 0]
+    assert points[1] == [0.15707963268, 0, 0]
+    assert points[2] == [0.314159265359, 0, 0]
+    assert points[3] == [0.471238898038, 0, 0]
+    assert points[4] == [0.628318530718, 0, 0]
+    assert points[5] == [0, 0, 0]
+    assert points[6] == [0.15707963268, 0, 0]
+    assert points[7] == [0.314159265359, 0, 0]
+    assert points[8] == [0.471238898038, 0, 0]
+    assert points[9] == [0.628318530718, 0, 0]
 
-    assert len(points[None]) == 10
+    assert len(points) == 10
 
-    assert list(points) == [None]
-    assert "FoamFile" in points
+    assert list(file) == [None]
+    assert "FoamFile" in file