diff options
| -rwxr-xr-x | rambo/__main__.py | 22 | ||||
| -rwxr-xr-x | rambo/meta.py | 6 |
2 files changed, 17 insertions, 11 deletions
diff --git a/rambo/__main__.py b/rambo/__main__.py index 7a1c29b..2c43a88 100755 --- a/rambo/__main__.py +++ b/rambo/__main__.py @@ -10,7 +10,7 @@ import sys import argparse from . import meta -def get_platform(): +def get_platform_arch(): plat_alias = sys.platform if plat_alias == 'darwin': plat_alias = 'osx' @@ -18,8 +18,8 @@ def get_platform(): arch_bits = '64' if not is64bit: arch_bits = '32' - platform = '{}-{}'.format(plat_alias, arch_bits) - return platform + platform_arch = '{}-{}'.format(plat_alias, arch_bits) + return platform_arch def main(argv=None): @@ -31,10 +31,10 @@ def main(argv=None): prog='rambo', description='Recipe Analyzer and Multi-Package Build Optimizer') parser.add_argument('-p', - '--platform', + '--platform_arch', type=str, - help='The platform specification string in the format that conda' - ' understands. I.e. "linux-64" or "osx-64". If not specified, the' + help='The platform-arch specification string in the format that' + ' conda uses. I.e. "linux-64" or "osx-64". If not specified, the' ' platform of the host system is used.') parser.add_argument( '--python', @@ -93,13 +93,17 @@ def main(argv=None): versions['numpy'] = meta.DEFAULT_MINIMUM_NUMPY_VERSION - if args.platform: - meta.Config.platform = args.platform + if args.platform_arch: + #meta.Config.platform = args.platform_arch + platform_arch = args.platform_arch else: - meta.Config.platform = get_platform() + #meta.Config.platform = get_platform_arch() + platform_arch = get_platform_arch() + mset = meta.MetaSet( recipes_dir, + platform_arch, versions=versions, dirty=args.dirty, manfile=args.manifest) diff --git a/rambo/meta.py b/rambo/meta.py index 24e40a8..4fdd114 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -144,6 +144,7 @@ class MetaSet(object): def __init__(self, directory, + platform_arch, versions, manfile=None, dirty=False): @@ -153,7 +154,8 @@ class MetaSet(object): versions - Dictionary containing python, numpy, etc, version information.''' self.metas = [] - self.platform = Config.platform + self.platform_arch = platform_arch + Config.platform = self.platform_arch.split('-')[0] self.versions = versions self.manfile = manfile self.manifest = None @@ -204,7 +206,7 @@ class MetaSet(object): mf = open(self.manfile, 'r') self.manifest = safe_load(mf) self.channel = self.manifest['channel_URL'].strip('/') - self.channel += '/' + self.platform + self.channel += '/' + self.platform_arch self.versions['numpy'] = str(self.manifest['numpy_version']) def filter_by_manifest(self): |