Update to YAtiML 0.11.1

setup.py

@@ -37,7 +37,6 @@
     python_requires='>=3.7, <4',
     test_suite='tests',
     install_requires=[
-        'ruamel.yaml<=0.17.21,!=0.17.5',
-        'yatiml>=0.10.0,<0.11.0'
+        'yatiml>=0.11.1,<0.12.0'
     ],
 )

tests/conftest.py

@@ -421,7 +421,7 @@ def test_yaml8() -> str:
             '    keeps_state_for_next_use: helpful\n'
             '  micro2_fortran:\n'
             '    executable: bin/micro2\n'
-            '    keeps_state_for_next_use: no\n'
+            '    keeps_state_for_next_use: \'no\'\n'
             'resources:\n'
             '  macro:\n'
             '    threads: 1\n'

tox.ini

@@ -8,10 +8,11 @@ deps =
     flake8
     pytest
     pytest-cov
+    types-PyYAML
 
 commands =
     mypy
-    pytest
+    pytest {posargs}
     flake8 ymmsl
 
 [gh-actions]

ymmsl/checkpoint.py

@@ -2,7 +2,7 @@
 
 from typing import List, Optional, Union
 
-from ruamel import yaml
+import yaml
 import yatiml
 
 

ymmsl/component.py

@@ -5,7 +5,7 @@
 from typing import Dict     # noqa: F401
 from typing import Iterable, List, Optional, Union
 
-import ruamel.yaml as yaml
+import yaml
 import yatiml
 
 from ymmsl.identity import Identifier, Reference
@@ -308,5 +308,5 @@ def _yatiml_sweeten(cls, node: yatiml.Node) -> None:
             node.set_attribute('multiplicity', items[0].get_value())
 
         ports_node = node.get_attribute('ports').yaml_node
-        if len(ports_node.value) == 0:
+        if ports_node.tag == 'tag:yaml.org,2002:null':
             node.remove_attribute('ports')

ymmsl/configuration.py

@@ -7,7 +7,7 @@
         Dict, List, MutableMapping, Optional, Sequence, Union, cast)
 
 import yatiml
-from ruamel import yaml
+import yaml
 
 from ymmsl.checkpoint import Checkpoints
 from ymmsl.document import Document

ymmsl/execution.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import cast, Dict, List, Optional, Union
 
-from ruamel import yaml
+import yaml
 import yatiml
 
 from ymmsl.identity import Reference