Skip to content

Commit

Permalink
Merge pull request #2886 from msarahan/clear_parent_in_output_recorde…
Browse files Browse the repository at this point in the history
…d_recipe

remove parent_recipe entry when recording meta.yaml for outputs
  • Loading branch information
msarahan authored May 17, 2018
2 parents 4482145 + e0f9079 commit e6edcab
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions conda_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ def copy_recipe(m):
# just for lack of confusion, don't show outputs in final rendered recipes
if 'outputs' in output_metadata.meta:
del output_metadata.meta['outputs']
if 'parent_recipe' in output_metadata.meta.get('extra', {}):
del output_metadata.meta['extra']['parent_recipe']

utils.sort_list_in_nested_structure(output_metadata.meta,
('build/script', 'test/commands'))
Expand Down Expand Up @@ -806,6 +808,7 @@ def bundle_conda(output, metadata, env, stats, **kw):

files = output.get('files', [])

# this is because without any requirements at all, we still need to have the host prefix exist
try:
os.makedirs(metadata.config.host_prefix)
except OSError:
Expand Down Expand Up @@ -1780,8 +1783,6 @@ def test(recipedir_or_package_or_metadata, config, stats, move_broken=True):

trace = '-x ' if metadata.config.debug else ''

metadata.config.compute_build_id(metadata.name())

# Must download *after* computing build id, or else computing build id will change
# folder destination
utils.rm_rf(metadata.config.test_dir)
Expand Down

0 comments on commit e6edcab

Please sign in to comment.