FourCIPP 1.5.0__tar.gz → 1.6.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.5.0
+Version: 1.6.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.5.0
+Version: 1.6.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)

{fourcipp-1.5.0 → fourcipp-1.6.0}/src/fourcipp/fourc_input.py

@@ -69,7 +69,7 @@ def is_section_known(section_name: str, known_section_names: list[str]) -> bool:
     return section_name in known_section_names or section_name.startswith("FUNCT")
 
 
-def _sort_by_section_names(data: dict) -> dict:
+def sort_by_section_names(data: dict) -> dict:
     """Sort a dictionary by its 4C sections.
 
     This sorts the dictionary in the following style:
@@ -495,7 +495,7 @@ class FourCInput:
         validate: bool = False,
         validate_sections_only: bool = False,
         convert_to_native_types: bool = True,
-        sort_function: Callable[[dict], dict] | None = _sort_by_section_names,
+        sort_function: Callable[[dict], dict] | None = sort_by_section_names,
         use_fourcipp_yaml_style: bool = True,
     ) -> None:
         """Dump object to yaml.

{fourcipp-1.5.0 → fourcipp-1.6.0}/src/fourcipp/utils/yaml_io.py

@@ -143,7 +143,13 @@ def dict_to_yaml_string(
         if tree.has_key(node_id):
             tree.set_key_style(node_id, ryml.NOTYPE)
 
-    return ryml.emit_yaml(tree)
+    yaml_string = ryml.emit_yaml(tree)
+
+    if use_fourcipp_yaml_style:
+        # add spaces after commas in vectors
+        yaml_string = re.sub(r"(?<=\d),(?=\d)|(?<=\]),(?=\[)", ", ", yaml_string)
+
+    return yaml_string
 
 
 def dump_yaml(

{fourcipp-1.5.0 → fourcipp-1.6.0}/src/fourcipp/version.py

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

{fourcipp-1.5.0 → fourcipp-1.6.0}/tests/fourcipp/test_fourc_input.py

@@ -34,7 +34,7 @@ from fourcipp import CONFIG
 from fourcipp.fourc_input import (
     FourCInput,
     UnknownSectionException,
-    _sort_by_section_names,
+    sort_by_section_names,
 )
 from fourcipp.utils.cli import modify_input_with_defaults
 from fourcipp.utils.validation import ValidationError
@@ -593,7 +593,7 @@ def test_sort_by_section_names():
 
     shuffled_data = {k: 1 for k in shuffled_section_order}
 
-    sorted_data = _sort_by_section_names(shuffled_data)
+    sorted_data = sort_by_section_names(shuffled_data)
 
     assert list(sorted_data.keys()) == correct_section_order
 

{fourcipp-1.5.0 → fourcipp-1.6.0}/tests/fourcipp/utils/test_yaml_io.py

@@ -86,8 +86,8 @@ def test_dump_sorted_alphabetically(tmp_path):
         (
             True,
             """SECTION:
-  - vector: [1.23,2,3]
-    nested_vector: [[1,2.0,3],[4.5,5,2.333]]
+  - vector: [1.23, 2, 3]
+    nested_vector: [[1, 2.0, 3], [4.5, 5, 2.333]]
   - list_with_bool:
       - 1
       - true
@@ -101,7 +101,7 @@ def test_dump_sorted_alphabetically(tmp_path):
       - "abc"
       - 5
     nested_list_with_string:
-      - [1,2.1]
+      - [1, 2.1]
       - - 2
         - "def"
 """,