From 4d958c7392d28ae0ed6504fa1b209d3f8ecea1d2 Mon Sep 17 00:00:00 2001
From: "Dougal J. Sutherland" <dougal@gmail.com>
Date: Thu, 19 Apr 2018 15:11:16 +0100
Subject: [PATCH 1/5] update conda-build in run_docker_build

---
 conda_smithy/templates/run_docker_build.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl
index e2be067b4..d0c542edc 100644
--- a/conda_smithy/templates/run_docker_build.tmpl
+++ b/conda_smithy/templates/run_docker_build.tmpl
@@ -56,7 +56,7 @@ echo "$config" > ~/.condarc
 # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
 conda clean --lock
 
-conda install --yes --quiet conda-forge-ci-setup=1
+conda install --yes --quiet conda-forge-ci-setup=1 conda-build
 {% if build_setup -%}
 {{ build_setup }}{% endif -%}
 

From 36e5ebb1b353e76b45bd462ffc10439ce58c0cf7 Mon Sep 17 00:00:00 2001
From: "Dougal J. Sutherland" <dougal@gmail.com>
Date: Thu, 19 Apr 2018 15:17:25 +0100
Subject: [PATCH 2/5] add news item

---
 news/update-conda-build.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 news/update-conda-build.rst

diff --git a/news/update-conda-build.rst b/news/update-conda-build.rst
new file mode 100644
index 000000000..43e80903b
--- /dev/null
+++ b/news/update-conda-build.rst
@@ -0,0 +1,13 @@
+**Added:** None
+
+* Update conda-build in the docker build script
+
+**Changed:** None
+
+**Deprecated:** None
+
+**Removed:** None
+
+**Fixed:** None
+
+**Security:** None

From 7aad5ff042158fb7a95995ac31d889a29d3ec731 Mon Sep 17 00:00:00 2001
From: "Dougal J. Sutherland" <dougal@gmail.com>
Date: Thu, 19 Apr 2018 19:56:23 +0100
Subject: [PATCH 3/5] update pinings also

---
 conda_smithy/templates/run_docker_build.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl
index d0c542edc..95a5adb9b 100644
--- a/conda_smithy/templates/run_docker_build.tmpl
+++ b/conda_smithy/templates/run_docker_build.tmpl
@@ -56,7 +56,8 @@ echo "$config" > ~/.condarc
 # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
 conda clean --lock
 
-conda install --yes --quiet conda-forge-ci-setup=1 conda-build
+# Make sure we pull in the latest pinnimgs and conda-build versions too
+conda install --yes --quiet conda-forge-ci-setup=1 conda-build conda-forge-pinning
 {% if build_setup -%}
 {{ build_setup }}{% endif -%}
 

From 1f789dbe80005a6f0dc25ccfe51c83f5f6a46f30 Mon Sep 17 00:00:00 2001
From: "Dougal J. Sutherland" <dougal@gmail.com>
Date: Thu, 19 Apr 2018 20:59:16 +0100
Subject: [PATCH 4/5] don't need to update pinnings in feedstock

---
 conda_smithy/templates/run_docker_build.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl
index 95a5adb9b..693e8412c 100644
--- a/conda_smithy/templates/run_docker_build.tmpl
+++ b/conda_smithy/templates/run_docker_build.tmpl
@@ -56,8 +56,8 @@ echo "$config" > ~/.condarc
 # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
 conda clean --lock
 
-# Make sure we pull in the latest pinnimgs and conda-build versions too
-conda install --yes --quiet conda-forge-ci-setup=1 conda-build conda-forge-pinning
+# Make sure we pull in the latest pconda-build version too
+conda install --yes --quiet conda-forge-ci-setup=1 conda-build
 {% if build_setup -%}
 {{ build_setup }}{% endif -%}
 

From e1ae50287a319e52926d38735ab15554b3e5c9e8 Mon Sep 17 00:00:00 2001
From: "Dougal J. Sutherland" <dougal@gmail.com>
Date: Thu, 19 Apr 2018 21:53:22 +0100
Subject: [PATCH 5/5] fix typo

---
 conda_smithy/templates/run_docker_build.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl
index 693e8412c..4bc9cf459 100644
--- a/conda_smithy/templates/run_docker_build.tmpl
+++ b/conda_smithy/templates/run_docker_build.tmpl
@@ -56,7 +56,7 @@ echo "$config" > ~/.condarc
 # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
 conda clean --lock
 
-# Make sure we pull in the latest pconda-build version too
+# Make sure we pull in the latest conda-build version too
 conda install --yes --quiet conda-forge-ci-setup=1 conda-build
 {% if build_setup -%}
 {{ build_setup }}{% endif -%}