Skip to content

Commit

Permalink
Merge pull request #2680 from msarahan/optional_trim_skip
Browse files Browse the repository at this point in the history
allow trimming of skipped metadata in rendering to be optional
  • Loading branch information
msarahan authored Feb 13, 2018
2 parents cd34b6e + 78eb5ed commit d4f2d95
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conda_build/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def render(recipe_path, config=None, variants=None, permit_unsatisfiable_variant
permit_unsatisfiable_variants=permit_unsatisfiable_variants)
output_metas = OrderedDict()
for meta, download, render_in_env in metadata_tuples:
if not meta.skip():
if not meta.skip() or not config.trim_skip:
for od, om in meta.get_output_metadata_set(
permit_unsatisfiable_variants=permit_unsatisfiable_variants,
permit_undefined_jinja=not finalize):
if not om.skip():
if not om.skip() or not config.trim_skip:
# only show conda packages right now
if 'type' not in od or od['type'] == 'conda':
if finalize and not om.final:
Expand Down
3 changes: 3 additions & 0 deletions conda_build/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ def _ensure_dir(path):
cc_conda_build.get('cache_dir')))) if cc_conda_build.get('cache_dir') else None),
Setting('copy_test_source_files', True),

# should rendering cut out any skipped metadata?
Setting('trim_skip', True),

# Disable the overlinking test for this package. This test checks that transitive DSOs
# are not referenced by DSOs in the package being built. When this happens something
# has gone wrong with:
Expand Down

0 comments on commit d4f2d95

Please sign in to comment.