Let compute_build_matrix return an empty matrix if the build is skipped.

conda-forge · Mar 14, 2017 · 75dc6bf · 75dc6bf
1 parent add52e1
commit 75dc6bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py
@@ -603,6 +603,10 @@ def meta_of_feedstock(forge_dir, config=None):
 
 
 def compute_build_matrix(meta, existing_matrix=None, channel_sources=tuple()):
+    if meta.skip():
+        # return empty version matrix if build will be skipped
+        return set()
+
     channel_sources = tuple(channel_sources)
 
     # Override what `defaults` means depending on the platform used.

diff --git a/conda_smithy/tests/test_configure_feedstock.py b/conda_smithy/tests/test_configure_feedstock.py
@@ -85,13 +85,14 @@ def test_r(self):
 
             def test(expect_skip=False):
                 meta.parse_again(**kwargs)
+
+                if expect_skip:
+                    self.assertEqual(meta.skip(), True)
+
                 matrix = cnfgr_fdstk.compute_build_matrix(
                     meta
                 )
 
-                if expect_skip:
-                    self.assertEqual(meta.skip(), True)
-
                 cases_not_skipped = []
                 for case in matrix:
                     pkgs, vars = cnfgr_fdstk.split_case(case)