foamlib 0.3.12__tar.gz → 0.3.14__tar.gz

{foamlib-0.3.12 → foamlib-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.3.12
+Version: 0.3.14
 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.3.12 → foamlib-0.3.14}/foamlib/__init__.py

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

{foamlib-0.3.12 → foamlib-0.3.14}/foamlib/_cases/_base.py

@@ -183,12 +183,14 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
         all_clean = self.path / "Allclean"
 
         if clean.is_file():
-            return clean
+            file = clean
         elif all_clean.is_file():
-            return all_clean
+            file = all_clean
         else:
             return None
 
+        return file if Path(__file__).absolute() != file.absolute() else None
+
     def _run_script(self, *, parallel: Optional[bool] = None) -> Optional[Path]:
         """Return the path to the (All)run script, or None if no run script is found."""
         run = self.path / "run"
@@ -199,21 +201,24 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
         if run.is_file() or all_run.is_file():
             if run_parallel.is_file() or all_run_parallel.is_file():
                 if parallel:
-                    return run_parallel if run_parallel.is_file() else all_run_parallel
+                    file = run_parallel if run_parallel.is_file() else all_run_parallel
                 elif parallel is False:
-                    return run if run.is_file() else all_run
+                    file = run if run.is_file() else all_run
                 else:
                     raise ValueError(
                         "Both (All)run and (All)run-parallel scripts are present. Please specify parallel argument."
                     )
-            return run if run.is_file() else all_run
+            else:
+                file = run if run.is_file() else all_run
         elif parallel is not False and (
             run_parallel.is_file() or all_run_parallel.is_file()
         ):
-            return run_parallel if run_parallel.is_file() else all_run_parallel
+            file = run_parallel if run_parallel.is_file() else all_run_parallel
         else:
             return None
 
+        return file if Path(__file__).absolute() != file.absolute() else None
+
     def _run_cmds(
         self,
         cmd: Optional[Union[Sequence[Union[str, Path]], str, Path]] = None,

{foamlib-0.3.12 → foamlib-0.3.14}/foamlib/_files/_parsing.py

@@ -134,7 +134,7 @@ _DIMENSIONS = (
     Literal("[").suppress() + common.number * 7 + Literal("]").suppress()
 ).set_parse_action(lambda tks: FoamDict.DimensionSet(*tks))
 _TENSOR = _list_of(common.number) | common.number
-_IDENTIFIER = Word(identchars + "$", printables, exclude_chars=";")
+_IDENTIFIER = Word(identchars + "$", printables, exclude_chars="{;}")
 _DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: FoamDict.Dimensioned(*reversed(tks.as_list()))
 )

{foamlib-0.3.12 → foamlib-0.3.14}/foamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.3.12
+Version: 0.3.14
 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