Merge pull request #4 from rendinam/numpy_arg

Take numpy version from cmd line argument, not manifest.

2 files changed, 11 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..faa0b92 100755
--- a/rambo/meta.py
+++ b/rambo/meta.py
@@ -207,7 +207,6 @@ 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'])
 
     def filter_by_manifest(self):
         '''Leave only the recipe metadata entries that appear in the