Skip to content

Commit

Permalink
Still install conda-forge-build-setup in case it is used selectively.
Browse files Browse the repository at this point in the history
This is handy when the upload script works fine, but the setup step
needs to be overridden. In these cases, we want to be sure
`conda-forge-build-setup` is still provided so the upload script can be
used from it if needed.
  • Loading branch information
jakirkham committed Nov 29, 2016
1 parent 89242be commit 9ce6d79
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def render_run_docker_build(jinja_env, forge_config, forge_dir):
""".format(recipe_dir=forge_config["recipe_dir"]))
else:
build_setup += textwrap.dedent("""\
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
""")
Expand Down Expand Up @@ -236,7 +235,6 @@ def render_travis(jinja_env, forge_config, forge_dir):
""".format(recipe_dir=forge_config["recipe_dir"]))
else:
build_setup += textwrap.dedent("""\
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
""")

Expand Down Expand Up @@ -399,7 +397,6 @@ def render_appveyor(jinja_env, forge_config, forge_dir):
else:
build_setup += textwrap.dedent("""\
conda install -n root --quiet --yes conda-forge-build-setup
run_conda_forge_build_setup
""")

Expand Down
1 change: 1 addition & 0 deletions conda_smithy/templates/appveyor.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ install:
- cmd: set PYTHONUNBUFFERED=1

- cmd: conda install -n root --quiet --yes obvious-ci
- cmd: conda install -n root --quiet --yes conda-forge-build-setup
{% if build_setup -%}
{{ build_setup }}{% endif %}

Expand Down
1 change: 1 addition & 0 deletions conda_smithy/templates/run_docker_build.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ echo "$config" > ~/.condarc
# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts.
conda clean --lock
conda install --yes --quiet conda-forge-build-setup
{% if build_setup -%}
{{ build_setup }}{% endif -%}
Expand Down
1 change: 1 addition & 0 deletions conda_smithy/templates/travis.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ install:
conda config --add channels {{ channel }}
{%- endfor %}
conda config --set show_channel_urls true
conda install --yes --quiet conda-forge-build-setup
{% if build_setup -%}
{{ build_setup }}{% endif %}

Expand Down

0 comments on commit 9ce6d79

Please sign in to comment.