Merge pull request #101 from pelson/whitespace_tidy

Further minor tweaks to whitespace.
conda-forge · Mar 26, 2016 · 95c4b8b · 95c4b8b
2 parents e5f71f3 + 6f1aac5
commit 95c4b8b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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 -%}