From de20557ddae9dde000ae36548dd61689010a6eb5 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 12:51:28 -0500 Subject: [PATCH 1/6] Pin conda-build to version 1.x --- recipe/run_conda_forge_build_setup_linux | 3 +++ recipe/run_conda_forge_build_setup_osx | 3 +++ recipe/run_conda_forge_build_setup_win | 3 +++ 3 files changed, 9 insertions(+) diff --git a/recipe/run_conda_forge_build_setup_linux b/recipe/run_conda_forge_build_setup_linux index fa643b6..5647560 100755 --- a/recipe/run_conda_forge_build_setup_linux +++ b/recipe/run_conda_forge_build_setup_linux @@ -12,5 +12,8 @@ conda config --set add_pip_as_python_dependency false conda update -n root --yes --quiet conda conda-build conda install -n root --yes --quiet jinja2 anaconda-client +# KLUDGE to work around changes in conda-build 2.0.0 +conda install -n root --yes --quiet conda-build=1 + conda info conda config --get diff --git a/recipe/run_conda_forge_build_setup_osx b/recipe/run_conda_forge_build_setup_osx index 96e5157..6f51653 100755 --- a/recipe/run_conda_forge_build_setup_osx +++ b/recipe/run_conda_forge_build_setup_osx @@ -12,5 +12,8 @@ conda config --set add_pip_as_python_dependency false conda update -n root --yes --quiet conda conda install -n root --yes --quiet jinja2 conda-build anaconda-client +# KLUDGE to work around changes in conda-build 2.0.0 +conda install -n root --yes --quiet conda-build=1 + conda info conda config --get diff --git a/recipe/run_conda_forge_build_setup_win b/recipe/run_conda_forge_build_setup_win index ede4b36..c335401 100755 --- a/recipe/run_conda_forge_build_setup_win +++ b/recipe/run_conda_forge_build_setup_win @@ -11,5 +11,8 @@ conda config --set add_pip_as_python_dependency false conda update -n root --yes --quiet conda conda install -n root --yes --quiet jinja2 conda-build anaconda-client +# KLUDGE to work around changes in conda-build 2.0.0 +conda install -n root --yes --quiet conda-build=1 + conda info conda config --get From cce87663ef0b3b62533b895cf488674fe20ff3bc Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 12:56:44 -0500 Subject: [PATCH 2/6] Bump version to 3.1.2 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acb122e..828841e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: conda-forge-build-setup - version: 3.1.1 + version: 3.1.2 build: number: 0 From a1d6a42a02ec15b27fb491f129af804ee55e3b78 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 12:59:13 -0500 Subject: [PATCH 3/6] Pin conda-build version in run_docker_build.sh --- ci_support/run_docker_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index 8c527c8..ebec076 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -41,6 +41,7 @@ conda clean --lock conda update --yes --all conda install --yes conda-build +conda install --yes conda-build=1 conda info # Embarking on 1 case(s). From 02950c16b5c86df41861d09306d7d4a1dce9f677 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 13:00:31 -0500 Subject: [PATCH 4/6] Fix comment character in windows script --- recipe/run_conda_forge_build_setup_win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/run_conda_forge_build_setup_win b/recipe/run_conda_forge_build_setup_win index c335401..4e1c57c 100755 --- a/recipe/run_conda_forge_build_setup_win +++ b/recipe/run_conda_forge_build_setup_win @@ -11,7 +11,7 @@ conda config --set add_pip_as_python_dependency false conda update -n root --yes --quiet conda conda install -n root --yes --quiet jinja2 conda-build anaconda-client -# KLUDGE to work around changes in conda-build 2.0.0 +:: KLUDGE to work around changes in conda-build 2.0.0 conda install -n root --yes --quiet conda-build=1 conda info From feac4b49a58a1e5ad70e9b5f3710f2f43928cc03 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 13:03:49 -0500 Subject: [PATCH 5/6] Pin conda-build in .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fd37f5b..0d7dda1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ install: conda update --yes conda conda install --yes conda-build jinja2 anaconda-client conda config --add channels conda-forge + conda install --yes conda-build=1 script: From b547646484dde8d4a516101778cf150fca42fc14 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 31 Aug 2016 13:04:04 -0500 Subject: [PATCH 6/6] Pin conda-build in appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 1b03f13..76ec24e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,6 +56,7 @@ install: # FIXME: Remove once there is a release that fixes the upstream issue # ( https://github.com/conda/conda-build/issues/895 ). - cmd: if "%TARGET_ARCH%" == "x64" if "%CONDA_PY%" == "34" conda install conda-build=1.20.0 --yes + - cmd: conda install -n root --quiet --yes conda-build=1 # Skip .NET project specific build phase. build: off