Merge branch 'develop'

georg-wolflein · Jan 10, 2021 · 4712f89 · 4712f89
2 parents 2cdbfaa + 58d9dac
commit 4712f89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,10 +26,10 @@ include = [
 python = "^3.6"
 yacs = "^0.1.8"
 pyyaml = "^5.3.1"
+wrapt = "^1.12.1"
 sphinx = { version = "^3.4.1", optional = true }
 sphinx-rtd-theme = { version = "^0.5.0", optional = true }
 m2r2 = { version = "^0.2.7", optional = true }
-wrapt = "^1.12.1"
 
 [tool.poetry.dev-dependencies]
 autopep8 = "^1.5.4"

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -6,6 +6,12 @@
 RESOURCES = Path(__file__).parent / "resources"
 
 
+def test_load_yaml():
+    cfg = CN.load_yaml_with_base(RESOURCES / "inherit_base.yaml")
+    assert cfg.TEST == 1
+    assert cfg.XYZ == "abc"
+
+
 def test_inherit_yaml():
     cfg = CN.load_yaml_with_base(RESOURCES / "inherit_override.yaml")
     assert cfg.TEST == 2