From e7ed479e490b5732c6a95c8fb51a8c2530ff13ca Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Aug 2018 17:21:42 -0400 Subject: Short circuit rendering data against invalid payload --- rambo/meta.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/rambo/meta.py b/rambo/meta.py index 7b99386..dd9bbe7 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -91,7 +91,14 @@ class Meta(object): filename_hashing=False) # enables --old-build-string # conda-build v3.x render() returns a list of tuples: # [(MetaData, bool, bool)] - self.metaobj = self.render_payload[0][0] + if not self.render_payload: + print('Skipping due to empty payload: Marking metadata as invalid') + self.valid = False + else: + self.metaobj = self.render_payload[0][0] + + if not self.valid: + return self.mdata = self.metaobj.meta self.valid = self.is_valid() @@ -148,11 +155,16 @@ class Meta(object): numpy=self.versions['numpy'], dirty=self.dirty) if CONDA_BUILD_MAJOR_VERSION == '3': + if self.metaobj is None: + print('Not rendering canonical name') + return + output_file_path = conda_build.api.get_output_file_paths( self.metaobj, python=self.versions['python'], numpy=self.versions['numpy'], dirty=self.dirty)[0] + self.canonical_name = os.path.basename(output_file_path) print('Package canonical name: {}\n\n'.format( self.canonical_name)) @@ -345,12 +357,13 @@ class MetaSet(object): versions=self.versions, channel=self.channel, dirty=self.dirty) - if not m.metaobj.skip(): - if m.complete: - self.metas.append(m) - self.names.append(m.name) - else: - self.incomplete_metas.append(m) + if m.valid: + if not m.metaobj.skip(): + if m.complete: + self.metas.append(m) + self.names.append(m.name) + else: + self.incomplete_metas.append(m) def read_recipes(self, directory): recipe_dirnames = os.listdir(directory) -- cgit From 10181d5ef0369cc6d720e70147ad8a35d02fd372 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Aug 2018 22:22:48 -0400 Subject: Do not count on verify attribute --- rambo/meta.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rambo/meta.py b/rambo/meta.py index dd9bbe7..2124df2 100755 --- a/rambo/meta.py +++ b/rambo/meta.py @@ -93,12 +93,11 @@ class Meta(object): # [(MetaData, bool, bool)] if not self.render_payload: print('Skipping due to empty payload: Marking metadata as invalid') - self.valid = False else: self.metaobj = self.render_payload[0][0] - if not self.valid: - return + if self.metaobj is None: + return self.mdata = self.metaobj.meta self.valid = self.is_valid() -- cgit From b85ebf45299f0e8a170c73c2b63ee1ab87f1eb2a Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Aug 2018 23:03:36 -0400 Subject: install_requires everything but conda_build --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5cdc2fe..dc6d937 100644 --- a/setup.py +++ b/setup.py @@ -22,5 +22,10 @@ setup( ], packages=find_packages(), package_data={'': ['README.md', 'LICENSE.txt']}, - entry_points={'console_scripts': ['rambo=rambo.__main__:main'], } + entry_points={'console_scripts': ['rambo=rambo.__main__:main'],}, + install_requires=[ + 'jinja2', + 'pyyaml', + 'six' + ], ) -- cgit From 4126394b6f9ba9c4c99a815c33eb2d7a027cc216 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Aug 2018 23:08:25 -0400 Subject: Bump version --- rambo/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rambo/_version.py b/rambo/_version.py index 744d9c7..bd3c1ce 100644 --- a/rambo/_version.py +++ b/rambo/_version.py @@ -1 +1 @@ -__version__ = '1.0.0b5' +__version__ = '1.0.0b6' -- cgit