Skip to content

Commit

Permalink
Use channels/sources for our index.
Browse files Browse the repository at this point in the history
Instead of using whatever `conda` finds to generate our index (e.g.
`.condarc`), this uses the `channels/sources` from the feedstock's
`conda-forge.yml` to determine what should constitute the index. This
matches more closely with what the CIs would do anyways as they get all
dependencies from this list.
  • Loading branch information
jakirkham committed Dec 19, 2016
1 parent a293c33 commit e434f61
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ def render_run_docker_build(jinja_env, forge_config, forge_dir):
meta = forge_config['package']
with fudge_subdir('linux-64', build_config=meta_config(meta)):
meta.parse_again()
matrix = compute_build_matrix(meta, forge_config.get('matrix'))
matrix = compute_build_matrix(
meta,
forge_config.get('matrix'),
forge_config.get('channels', {}).get('sources', tuple())
)
cases_not_skipped = []
for case in matrix:
pkgs, vars = split_case(case)
Expand Down Expand Up @@ -164,7 +168,11 @@ def render_circle(jinja_env, forge_config, forge_dir):
meta = forge_config['package']
with fudge_subdir('linux-64', build_config=meta_config(meta)):
meta.parse_again()
matrix = compute_build_matrix(meta, forge_config.get('matrix'))
matrix = compute_build_matrix(
meta,
forge_config.get('matrix'),
forge_config.get('channels', {}).get('sources', tuple())
)

cases_not_skipped = []
for case in matrix:
Expand Down Expand Up @@ -217,7 +225,11 @@ def render_travis(jinja_env, forge_config, forge_dir):
meta = forge_config['package']
with fudge_subdir('osx-64', build_config=meta_config(meta)):
meta.parse_again()
matrix = compute_build_matrix(meta, forge_config.get('matrix'))
matrix = compute_build_matrix(
meta,
forge_config.get('matrix'),
forge_config.get('channels', {}).get('sources', tuple())
)

cases_not_skipped = []
for case in matrix:
Expand Down Expand Up @@ -349,7 +361,11 @@ def render_appveyor(jinja_env, forge_config, forge_dir):
for platform, arch in [['win-32', 'x86'], ['win-64', 'x64']]:
with fudge_subdir(platform, build_config=meta_config(meta)):
meta.parse_again()
matrix = compute_build_matrix(meta, forge_config.get('matrix'))
matrix = compute_build_matrix(
meta,
forge_config.get('matrix'),
forge_config.get('channels', {}).get('sources', tuple())
)

cases_not_skipped = []
for case in matrix:
Expand Down

0 comments on commit e434f61

Please sign in to comment.