diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-09-06 10:50:29 -0400 | 
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-09-06 10:50:29 -0400 | 
| commit | a358e76fb68dc13dd07364daf6ed9538041c2613 (patch) | |
| tree | 3d36ca84d1507ee3a3539b74814cd2a7ac7d83fc /rambo | |
| parent | 3615ba7ad8404d2b97db505a88b1875736c1cb00 (diff) | |
| download | rambo-a358e76fb68dc13dd07364daf6ed9538041c2613.tar.gz | |
Take numpy version from cmd line argument, not manifest
Diffstat (limited to 'rambo')
| -rwxr-xr-x | rambo/__main__.py | 15 | ||||
| -rwxr-xr-x | rambo/meta.py | 2 | 
2 files changed, 12 insertions, 5 deletions
| diff --git a/rambo/__main__.py b/rambo/__main__.py index 2c43a88..88570d5 100755 --- a/rambo/__main__.py +++ b/rambo/__main__.py @@ -43,6 +43,13 @@ def main(argv=None):              'recipes. "#.#" format. If not specified, the version of python'              ' hosting conda_build.api is used.')      parser.add_argument( +            '--numpy', +            type=str, +            help='numpy version to pass to conda machinery when rendering ' +            'recipes. "#.#" format. If not specified, the version value \'{}\'' +            ' is used.'.format( +                meta.DEFAULT_MINIMUM_NUMPY_VERSION)) +    parser.add_argument(              '-m',              '--manifest',              type=str, @@ -91,16 +98,16 @@ def main(argv=None):      if args.python:          versions['python'] = args.python -    versions['numpy'] = meta.DEFAULT_MINIMUM_NUMPY_VERSION +    if args.numpy: +        versions['numpy'] = args.numpy +    else: +        versions['numpy'] = meta.DEFAULT_MINIMUM_NUMPY_VERSION      if args.platform_arch: -        #meta.Config.platform = args.platform_arch          platform_arch = args.platform_arch      else: -        #meta.Config.platform = get_platform_arch()          platform_arch = get_platform_arch() -      mset = meta.MetaSet(              recipes_dir,              platform_arch, diff --git a/rambo/meta.py b/rambo/meta.py index 4fdd114..36d6dbe 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -207,7 +207,7 @@ class MetaSet(object):          self.manifest = safe_load(mf)          self.channel = self.manifest['channel_URL'].strip('/')          self.channel += '/' + self.platform_arch -        self.versions['numpy'] = str(self.manifest['numpy_version']) +        #self.versions['numpy'] = str(self.manifest['numpy_version'])      def filter_by_manifest(self):          '''Leave only the recipe metadata entries that appear in the | 
