default to none

conda-forge · Sep 19, 2019 · 64edb9b · 64edb9b
1 parent 6d72c87
commit 64edb9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/conda_smithy/variant_algebra.py b/conda_smithy/variant_algebra.py
@@ -175,7 +175,7 @@ def variant_add(v1: dict, v2: dict) -> Dict[str, Any]:
     joint_variant = {}
     for k in joint:
         v_left, v_right = ensure_list(v1[k]), ensure_list(v2[k])
-        joint_variant[k] = variant_key_add(k, v_left, v_right, ordering=ordering.get(k, []))
+        joint_variant[k] = variant_key_add(k, v_left, v_right, ordering=ordering.get(k, None))
 
     out = {
         **toolz.keyfilter(lambda k: k in left, v1),

diff --git a/tests/test_variant_algebra.py b/tests/test_variant_algebra.py
@@ -112,6 +112,8 @@ def test_no_ordering():
     __migrator:
         kind:
             version
+        migration_no:
+            1
     xyz:
         - 2
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,8 @@ def test_no_ordering(): @@
         __migrator:
             kind:
                 version
+            migration_no:
         xyz:
             - 2
         """
@@ Expand Down @@