From 6f1aac520d679da14c14342bacd8cd4ec3859470 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Sat, 26 Mar 2016 22:53:58 +0000 Subject: [PATCH] Further minor tweaks to whitespace. --- conda_smithy/templates/run_docker_build.tmpl | 10 +++++----- .../templates/run_docker_build_matrix.tmpl | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl index 67974ae03..d78cfdfeb 100644 --- a/conda_smithy/templates/run_docker_build.tmpl +++ b/conda_smithy/templates/run_docker_build.tmpl @@ -45,12 +45,12 @@ conda install --yes conda-build==1.18.2 conda info {% if build_setup %} -{{ build_setup }}{% endif %} -{% block build %} - conda build /recipe_root --quiet || exit 1 +{{ build_setup }}{% endif -%} +{%- block build %} +conda build /recipe_root --quiet || exit 1 {%- for owner, channel in channels['targets'] %} - /feedstock_root/ci_support/upload_or_check_non_existence.py /recipe_root {{ owner }} --channel={{ channel }} || exit 1 -{%- endfor %} +/feedstock_root/ci_support/upload_or_check_non_existence.py /recipe_root {{ owner }} --channel={{ channel }} || exit 1 +{%- endfor -%} {%- endblock -%} EOF diff --git a/conda_smithy/templates/run_docker_build_matrix.tmpl b/conda_smithy/templates/run_docker_build_matrix.tmpl index de5f96fc4..74d0b7a71 100644 --- a/conda_smithy/templates/run_docker_build_matrix.tmpl +++ b/conda_smithy/templates/run_docker_build_matrix.tmpl @@ -3,20 +3,20 @@ {% macro matrix_env(matrix_item) -%} {% for dep_name, version in matrix_item | sort %} {%- if dep_name in conda_vars %}{% set version = version|replace('.', '') %}{% endif %} - export {{ conda_vars.get(dep_name, 'CONDA_' + dep_name|upper) }}={{ version }}{% endfor %} + export {{ conda_vars.get(dep_name, 'CONDA_' + dep_name|upper) }}={{ version }}{% endfor %} {%- endmacro -%} {%- block build -%} # Embarking on {{ matrix|length }} case(s). {%- for case in matrix | sort %} {%- if case %} - set -x - {{- matrix_env(case) }} - set +x - {% endif -%} - {{ super() }} + set -x + {{- matrix_env(case) }} + set +x + {%- endif -%} + {{- super()|indent(4) }} {% endfor %}{% endblock -%} {%- block test_and_upload -%}{% for case in matrix | sort -%} - {{ matrix_env(case) }} - {{- super()|indent(2) }} + {{ matrix_env(case) }} + {{- super()|indent(4) }} {%- endfor -%}{% endblock -%}