diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-07-07 21:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 21:31:02 -0400 |
| commit | 5c3324a34cd5cc7263d109fa4e1f8197b61a9985 (patch) | |
| tree | bec1df4dd611f80d87ca7afe42b4b4604ca1fbf2 | |
| parent | 64c5e3aa56c2c9ce9c7c15fdf22aabed05e1efdf (diff) | |
| parent | cf96f1e8ec5672686c81b0e63e6c00a2ac4eed6a (diff) | |
| download | rambo-5c3324a34cd5cc7263d109fa4e1f8197b61a9985.tar.gz | |
Merge pull request #1 from rendinam/skip+platform
Skip directive; better platform spec
| -rw-r--r-- | rambo/__main__.py | 3 | ||||
| -rwxr-xr-x | rambo/meta.py | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/rambo/__main__.py b/rambo/__main__.py index db74132..5f9eaa9 100644 --- a/rambo/__main__.py +++ b/rambo/__main__.py @@ -77,9 +77,10 @@ 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 7c8ff58..3951f32 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -18,6 +18,7 @@ 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' @@ -71,6 +72,9 @@ 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)) @@ -128,7 +132,6 @@ class MetaSet(object): def __init__(self, directory, versions, - platform, manfile=None, dirty=False): '''Parameters: @@ -137,7 +140,7 @@ class MetaSet(object): versions - Dictionary containing python, numpy, etc, version information.''' self.metas = [] - self.platform = platform + self.platform = Config.platform self.versions = versions self.manfile = manfile self.manifest = None @@ -165,11 +168,12 @@ class MetaSet(object): continue rdir = directory + '/' + rdirname m = Meta(rdir, versions=self.versions, dirty=self.dirty) - if m.complete: - self.metas.append(m) - self.names.append(m.name) - else: - self.incomplete_metas.append(m) + if not m.metaobj.skip(): + 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) |