FourCIPP 1.4.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

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/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/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
+__version__ = version = '1.6.0'
+__version_tuple__ = version_tuple = (1, 6, 0)
 
 __commit_id__ = commit_id = None

{fourcipp-1.4.0.dist-info → fourcipp-1.6.0.dist-info}/METADATA

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

{fourcipp-1.4.0.dist-info → fourcipp-1.6.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 fourcipp/__init__.py,sha256=4pz7DVXErSbUcLqPTaHnQfdJzKkpfZDivBqbHbTgpRE,1388
-fourcipp/fourc_input.py,sha256=TXVP-N_FTadt4L8MPH3VZXeT7i5uy7Btz3H-N0pxMr0,23948
-fourcipp/version.py,sha256=qX8_mGjWClM0QeMyVAByaVXEA4Pk87fxkFSMEQx9-KM,704
-fourcipp/config/4C_metadata.yaml,sha256=3n3Uj24iblvsfqUI-8H2LYMHOROjeHl68Nok0F22Unc,11868927
-fourcipp/config/4C_schema.json,sha256=67giZGZSKXkjO_NCbZzx-blVdGB6BFXRbHrXkmqB_T4,16412275
+fourcipp/fourc_input.py,sha256=ocyxXdu8NFIRM94dc4EG_r8XsBkJajvw1YWHmZh-G6Y,23946
+fourcipp/version.py,sha256=QuifT9FwIKV3Bt8At2-CvH3sl5xacVDBQsWlFAqVjbg,704
+fourcipp/config/4C_metadata.yaml,sha256=A2cJVUA_PMZ3Y_mGP-M3VhpQhLbSn1a1oh3gfGpJ9GQ,11868923
+fourcipp/config/4C_schema.json,sha256=wDRSORrXQpg8cIhIOxeD2GTqfewUE4ygbPSeluSH7b0,16412271
 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=bs78Mc3fIz0kK5wgwwu89OhaDpLzECTRBQtIpnifTqk,5559
-fourcipp-1.4.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
-fourcipp-1.4.0.dist-info/METADATA,sha256=ldyK7yc2khoquz4mNXn5ibAG8EATRDaUlYiPxNnsGW4,7947
-fourcipp-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fourcipp-1.4.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
-fourcipp-1.4.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
-fourcipp-1.4.0.dist-info/RECORD,,
+fourcipp/utils/yaml_io.py,sha256=dE-TxqS0JFoHfmYkKAbl6sBa3Y80zIvgIJ6C1qhoy6o,5750
+fourcipp-1.6.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
+fourcipp-1.6.0.dist-info/METADATA,sha256=8JflGv2PGnMAtwoGv4jrCw1un04tDe6XJlZbIIEx7dk,7947
+fourcipp-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fourcipp-1.6.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
+fourcipp-1.6.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
+fourcipp-1.6.0.dist-info/RECORD,,