diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-09-15 12:13:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 12:13:58 -0400 |
| commit | ce0ee987a7c3a6ee92f22590a01e885e9757f6ca (patch) | |
| tree | e01c0de9b9947dee5696cc8ea192a7cae43438cf | |
| parent | 33b7b0951a9f6cc69988de6ab471577863d5c828 (diff) | |
| parent | 09fc0f4d2a05a4c4a4b33c730af7679dd92631c5 (diff) | |
| download | rambo-ce0ee987a7c3a6ee92f22590a01e885e9757f6ca.tar.gz | |
Merge pull request #5 from rendinam/old_build_string
Force old build string behavior under conda-build 3.x for now
| -rw-r--r-- | rambo/_version.py | 2 | ||||
| -rwxr-xr-x | rambo/meta.py | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/rambo/_version.py b/rambo/_version.py index 6f6463d..734f8d2 100644 --- a/rambo/_version.py +++ b/rambo/_version.py @@ -1 +1 @@ -__version__ = '1.0.0b2' +__version__ = '1.0.0b3' diff --git a/rambo/meta.py b/rambo/meta.py index faa0b92..abb6cff 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -61,16 +61,22 @@ class Meta(object): the conda recipe renderer to perform string interpolation and store the values in a dictionary.''' if os.path.isfile(rdir + '/meta.yaml'): - self.render_payload = conda_build.api.render( - rdir, - dirty=self.dirty, - python=self.versions['python'], - numpy=self.versions['numpy']) if CONDA_BUILD_MAJOR_VERSION == '2': + self.render_payload = conda_build.api.render( + rdir, + dirty=self.dirty, + python=self.versions['python'], + numpy=self.versions['numpy']) # conda-build v2.x render() returns a tuple: # (MetaData, bool, bool) self.metaobj = self.render_payload[0] if CONDA_BUILD_MAJOR_VERSION == '3': + self.render_payload = conda_build.api.render( + rdir, + dirty=self.dirty, + python=self.versions['python'], + numpy=self.versions['numpy'], + filename_hashing=False) # conda-build v3.x render() return a list of tuples: # [(MetaData, bool, bool)] self.metaobj = self.render_payload[0][0] |