From a358e76fb68dc13dd07364daf6ed9538041c2613 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Wed, 6 Sep 2017 10:50:29 -0400 Subject: Take numpy version from cmd line argument, not manifest --- rambo/__main__.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'rambo/__main__.py') diff --git a/rambo/__main__.py b/rambo/__main__.py index 2c43a88..88570d5 100755 --- a/rambo/__main__.py +++ b/rambo/__main__.py @@ -42,6 +42,13 @@ def main(argv=None): help='Python version to pass to conda machinery when rendering ' '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', @@ -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, -- cgit