Merge pull request #493 from johanneskoester/conda-build-all-1.0.3

Depend on conda-build-all 1.0.3. Remove previous workaround.
conda-forge · Mar 23, 2017 · 71f5490 · 71f5490
2 parents dfda2e8 + 5a8fe51
commit 71f5490
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py
@@ -605,10 +605,6 @@ 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/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # This list is duplicated in the conda_smithy.recipe/meta.yaml.
 
-conda-build-all
+conda-build-all >=1.0.3
 setuptools
 conda
 conda-build >=1.21.12,!=2.0.9