FourCIPP 1.7.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

fourcipp/utils/yaml_io.py

@@ -23,9 +23,9 @@
 
 import json
 import pathlib
-import re
 from typing import Callable
 
+import regex
 import ryml
 
 from fourcipp.utils.typing import Path
@@ -50,12 +50,12 @@ def load_yaml(path_to_yaml_file: Path) -> dict:
     )
 
     # Convert `inf` to a string to avoid JSON parsing errors, see https://github.com/biojppm/rapidyaml/issues/312
-    json_str = re.sub(r":\s*(-?)inf\b", r': "\1inf"', json_str)
+    json_str = regex.sub(r":\s*(-?)inf\b", r': "\1inf"', json_str)
 
     # Convert floats that are missing digits on either side of the decimal point
     # so .5 to 0.5 and 5. to 5.0
-    json_str = re.sub(r":\s*(-?)\.([0-9]+)", r": \g<1>0.\2", json_str)
-    json_str = re.sub(r":\s*(-?)([0-9]+)\.(\D)", r": \1\2.0\3", json_str)
+    json_str = regex.sub(r":\s*(-?)\.([0-9]+)", r": \g<1>0.\2", json_str)
+    json_str = regex.sub(r":\s*(-?)([0-9]+)\.(\D)", r": \1\2.0\3", json_str)
 
     data = json.loads(json_str)
 
@@ -147,7 +147,7 @@ def dict_to_yaml_string(
 
     if use_fourcipp_yaml_style:
         # add spaces after commas in vectors
-        yaml_string = re.sub(r"(?<=\d),(?=\d)|(?<=\]),(?=\[)", ", ", yaml_string)
+        yaml_string = regex.sub(r"(?<=\d),(?=\d)|(?<=\]),(?=\[)", ", ", yaml_string)
 
     return yaml_string
 

fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.7.0'
-__version_tuple__ = version_tuple = (1, 7, 0)
+__version__ = version = '1.9.0'
+__version_tuple__ = version_tuple = (1, 9, 0)
 
 __commit_id__ = commit_id = None

{fourcipp-1.7.0.dist-info → fourcipp-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.7.0
+Version: 1.9.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)
@@ -29,10 +29,11 @@ Project-URL: Issues, https://github.com/4C-multiphysics/fourcipp/issues/
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: rapidyaml
-Requires-Dist: loguru
 Requires-Dist: jsonschema-rs
+Requires-Dist: loguru
 Requires-Dist: numpy
+Requires-Dist: rapidyaml
+Requires-Dist: regex
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{fourcipp-1.7.0.dist-info → fourcipp-1.9.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 fourcipp/__init__.py,sha256=4pz7DVXErSbUcLqPTaHnQfdJzKkpfZDivBqbHbTgpRE,1388
 fourcipp/fourc_input.py,sha256=ocyxXdu8NFIRM94dc4EG_r8XsBkJajvw1YWHmZh-G6Y,23946
-fourcipp/version.py,sha256=oGRWiKvEGHesjf5wCNHGVlYfAA3dInDJeL5EiMaru6A,704
-fourcipp/config/4C_metadata.yaml,sha256=A2cJVUA_PMZ3Y_mGP-M3VhpQhLbSn1a1oh3gfGpJ9GQ,11868923
-fourcipp/config/4C_schema.json,sha256=wDRSORrXQpg8cIhIOxeD2GTqfewUE4ygbPSeluSH7b0,16412271
+fourcipp/version.py,sha256=AtjxHq9kv-0yMAzRwHHBjgcgVwDgXpdcdWCOAtKF-sQ,704
+fourcipp/config/4C_metadata.yaml,sha256=naOTFYus4jWwu0Fhd5F-YlC4T25pVaG1TEY8WO045xA,11868927
+fourcipp/config/4C_schema.json,sha256=T5vDfgHvRx-k4W4ECdb_NqR2vm33-CKOe_OTfTonSu0,16412275
 fourcipp/config/config.yaml,sha256=n2c2a6E4HKfAdNWOQz1kLUuf5p4NLxIddaAi2t5eM38,460
 fourcipp/legacy_io/__init__.py,sha256=y6aTjgUe61OQSl1NMiZ-fQAGTab_xNT1eJTnaTnsIkc,5744
 fourcipp/legacy_io/element.py,sha256=b8--f3IR9nB68R25mk4DHHOBdDLqASewtAdPZAkA2t4,3971
@@ -19,10 +19,10 @@ fourcipp/utils/metadata.py,sha256=98jz9Gm8qdvZ-b1jwYObNJTaiMQWwbknvS70Nv6Gwhk,12
 fourcipp/utils/not_set.py,sha256=04C_3axe2cupBYgfpgDAcGs1zHVzG3I58UGO58TH05A,2017
 fourcipp/utils/typing.py,sha256=8iX9PuKe8B1WJ3vEjiM5ZfefvgYnaZDiSdB7Nx9SrVw,1625
 fourcipp/utils/validation.py,sha256=FejHOj1MddaU7gEpMN-f8Mz3rYjflakd1qcsKnctHqA,5292
-fourcipp/utils/yaml_io.py,sha256=dE-TxqS0JFoHfmYkKAbl6sBa3Y80zIvgIJ6C1qhoy6o,5750
-fourcipp-1.7.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
-fourcipp-1.7.0.dist-info/METADATA,sha256=iCiKicCsJKxaow23-0e2X_Il5gK9oCw5j-R_WkJLoks,7894
-fourcipp-1.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fourcipp-1.7.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
-fourcipp-1.7.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
-fourcipp-1.7.0.dist-info/RECORD,,
+fourcipp/utils/yaml_io.py,sha256=GZtgBn-5OB7xAJmgjo66eG3JwkHnfQFp4VIA2-rVVSg,5765
+fourcipp-1.9.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
+fourcipp-1.9.0.dist-info/METADATA,sha256=Qg75rJcQsp4TiiqWrFM3VrABWCQwE2pC10d3gSapQz4,7915
+fourcipp-1.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fourcipp-1.9.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
+fourcipp-1.9.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
+fourcipp-1.9.0.dist-info/RECORD,,