Merge branch 'develop' into release-0.7.2

docs/source/examples/python/requirements.txt

@@ -1,6 +1,5 @@
 matplotlib>=3,<4
-numpy<1.22; python_version=='3.7'
-numpy>=1.22; python_version>='3.8'
+numpy>=1.22
 sobol_seq==0.2.0
 yatiml>=0.10.0,<0.11
 ymmsl>=0.13,<0.14

muscle3/muscle_manager.py

@@ -6,7 +6,7 @@
 from typing import Optional, Sequence
 
 import click
-from ruamel.yaml.scanner import ScannerError
+from yaml.scanner import ScannerError
 from yatiml import RecognitionError
 import ymmsl
 from ymmsl import Identifier, PartialConfiguration
@@ -168,8 +168,8 @@ def load_configuration(path: str) -> PartialConfiguration:
     with open(path, 'r') as f:
         try:
             return ymmsl.load(f)
-        except ScannerError as exc:  # capture ruamel.yaml errors
-            # ruamel.yaml error messages are not very user friendly, but there is not
+        except ScannerError as exc:  # capture yaml errors
+            # PyYAML error messages are not very user friendly, but there is not
             # too much we can do about it
             print(f"Syntax error while loading configuration file '{path}':",
                   file=sys.stderr)

setup.cfg

@@ -40,7 +40,7 @@ ignore_missing_imports = True
 [mypy-netifaces.*]
 ignore_missing_imports = True
 
-[mypy-ruamel.*]
+[mypy-yaml.*]
 ignore_missing_imports = True
 
 [mypy-numpy.*]