Merge pull request #5 from rendinam/revert-4-platform_skip

Revert "Skip directive; platform selection"

2 files changed, 8 insertions, 13 deletions

diff --git a/rambo/__main__.py b/rambo/__main__.py
index 5f9eaa9..db74132 100644
--- a/rambo/__main__.py
+++ b/rambo/__main__.py
@@ -77,10 +77,9 @@ def main(argv=None):
 
     versions['numpy'] = meta.DEFAULT_MINIMUM_NUMPY_VERSION
 
-    meta.Config.platform = args.platform
-
     mset = meta.MetaSet(
             recipes_dir,
+            platform=args.platform,
             versions=versions,
             dirty=args.dirty,
             manfile=args.manifest)
diff --git a/rambo/meta.py b/rambo/meta.py
index 3951f32..7c8ff58 100755
--- a/rambo/meta.py
+++ b/rambo/meta.py
@@ -18,7 +18,6 @@ import json
 from ._version import __version__
 try:
     import conda_build.api
-    from conda_build.config import Config
 except ImportError:
     print('conda-build must be installed order to use this tool. \n'
           'Either conda-build is not installed, or you are working in an \n'
@@ -72,9 +71,6 @@ class Meta(object):
             self.complete = self.is_complete()
             if self.valid:
                 self.name = self.mdata['package']['name']
-            if self.metaobj.skip():
-                print('skipping on selected platform due to directive: {}'.format(
-                    self.name))
         else:
             print('Recipe directory {0} has no meta.yaml file.'.format(
                 self.recipe_dirname))
@@ -132,6 +128,7 @@ class MetaSet(object):
     def __init__(self,
                  directory,
                  versions,
+                 platform,
                  manfile=None,
                  dirty=False):
         '''Parameters:
@@ -140,7 +137,7 @@ class MetaSet(object):
         versions - Dictionary containing python, numpy, etc, version
           information.'''
         self.metas = []
-        self.platform = Config.platform
+        self.platform = platform
         self.versions = versions
         self.manfile = manfile
         self.manifest = None
@@ -168,12 +165,11 @@ class MetaSet(object):
                 continue
             rdir = directory + '/' + rdirname
             m = Meta(rdir, versions=self.versions, dirty=self.dirty)
-            if not m.metaobj.skip():
-                if m.complete:
-                    self.metas.append(m)
-                    self.names.append(m.name)
-                else:
-                    self.incomplete_metas.append(m)
+            if m.complete:
+                self.metas.append(m)
+                self.names.append(m.name)
+            else:
+                self.incomplete_metas.append(m)
 
     def read_recipes(self, directory):
         recipe_dirnames = os.listdir(directory)