diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-09-18 12:54:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 12:54:41 -0400 |
| commit | 5cb922c99d4f2097e53fe9193a89a42e67a16d19 (patch) | |
| tree | c12e799ac430a3b604f597700b3a5600bd8ea75d | |
| parent | ce0ee987a7c3a6ee92f22590a01e885e9757f6ca (diff) | |
| parent | e7987910178ca02486442df9ba1f11fde07a79e0 (diff) | |
| download | rambo-5cb922c99d4f2097e53fe9193a89a42e67a16d19.tar.gz | |
Merge pull request #6 from rendinam/render_with_channel
Pass manifest channel URL as config value to render call
| -rwxr-xr-x | rambo/meta.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/rambo/meta.py b/rambo/meta.py index abb6cff..2c22d3a 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -35,9 +35,10 @@ class Meta(object): certain values derived from that data, and methods to calculate those derived values.''' - def __init__(self, recipe_dir, versions, dirty=False): + def __init__(self, recipe_dir, versions, channel, dirty=False): self.recipe_dirname = os.path.basename(recipe_dir) self.versions = versions + self.channel = channel self.dirty = dirty self.metaobj = None # renderdata[0] (MetaData) self.mdata = None # renderdata[0].meta (dict) @@ -66,7 +67,7 @@ class Meta(object): rdir, dirty=self.dirty, python=self.versions['python'], - numpy=self.versions['numpy']) + Numpy=self.versions['numpy']) # conda-build v2.x render() returns a tuple: # (MetaData, bool, bool) self.metaobj = self.render_payload[0] @@ -76,8 +77,9 @@ class Meta(object): dirty=self.dirty, python=self.versions['python'], numpy=self.versions['numpy'], + channel_urls=[self.channel], filename_hashing=False) - # conda-build v3.x render() return a list of tuples: + # conda-build v3.x render() returns a list of tuples: # [(MetaData, bool, bool)] self.metaobj = self.render_payload[0][0] self.mdata = self.metaobj.meta @@ -188,7 +190,10 @@ class MetaSet(object): if rdirname in self.ignore_dirs: continue rdir = directory + '/' + rdirname - m = Meta(rdir, versions=self.versions, dirty=self.dirty) + m = Meta(rdir, + versions=self.versions, + channel=self.channel, + dirty=self.dirty) if not m.metaobj.skip(): if m.complete: self.metas.append(m) |