FourCIPP 1.6.0__tar.gz → 1.8.0__tar.gz

{fourcipp-1.6.0/src/FourCIPP.egg-info → fourcipp-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.6.0
+Version: 1.8.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)
@@ -29,12 +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: jsonschema
-Requires-Dist: loguru
-Requires-Dist: ruamel.yaml
 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.6.0 → fourcipp-1.8.0}/requirements.in

@@ -1,6 +1,5 @@
-rapidyaml
-jsonschema
-loguru
-ruamel.yaml
 jsonschema-rs
+loguru
 numpy
+rapidyaml
+regex

{fourcipp-1.6.0 → fourcipp-1.8.0}/requirements.txt

@@ -4,21 +4,13 @@
 #
 #    pip-compile --all-extras --output-file=requirements.txt requirements.in
 #
-attrs==25.3.0
-    # via
-    #   jsonschema
-    #   referencing
 deprecation==2.1.0
     # via rapidyaml
-jsonschema==4.23.0
+jsonschema-rs==0.33.0
     # via -r requirements.in
-jsonschema-rs==0.30.0
-    # via -r requirements.in
-jsonschema-specifications==2025.4.1
-    # via jsonschema
 loguru==0.7.3
     # via -r requirements.in
-numpy==2.2.5
+numpy==2.3.2
     # via -r requirements.in
 packaging==25.0
     # via deprecation
@@ -26,17 +18,6 @@ rapidyaml
     # TODO update requirements file
     # manually removed version because on macos 0.9.0.post2 is latest
     # and on linux/windows 0.9.0 is latest
-referencing==0.36.2
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-rpds-py==0.24.0
-    # via
-    #   jsonschema
-    #   referencing
-ruamel-yaml==0.18.10
     # via -r requirements.in
-ruamel-yaml-clib==0.2.12
-    # via ruamel-yaml
-typing-extensions==4.13.2
-    # via referencing
+regex==2025.9.1
+    # via -r requirements.in

{fourcipp-1.6.0 → fourcipp-1.8.0/src/FourCIPP.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.6.0
+Version: 1.8.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)
@@ -29,12 +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: jsonschema
-Requires-Dist: loguru
-Requires-Dist: ruamel.yaml
 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.6.0 → fourcipp-1.8.0}/src/FourCIPP.egg-info/requires.txt

@@ -1,9 +1,8 @@
-rapidyaml
-jsonschema
-loguru
-ruamel.yaml
 jsonschema-rs
+loguru
 numpy
+rapidyaml
+regex
 
 [dev]
 pre-commit

{fourcipp-1.6.0 → fourcipp-1.8.0}/src/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-1.6.0 → fourcipp-1.8.0}/src/fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.8.0'
+__version_tuple__ = version_tuple = (1, 8, 0)
 
-__commit_id__ = commit_id = 'g789740a0d'
+__commit_id__ = commit_id = 'gbcd3a06ff'