Skip to content

Commit

Permalink
Merge pull request conda-forge#27 from jjhelmus/pin_conda_build
Browse files Browse the repository at this point in the history
Pin conda-build to version 1.x
  • Loading branch information
jakirkham authored Aug 31, 2016
2 parents 2e4e4b4 + b547646 commit c8d2f58
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: conda-forge-build-setup
version: 3.1.1
version: 3.1.2

build:
number: 0
Expand Down
3 changes: 3 additions & 0 deletions recipe/run_conda_forge_build_setup_linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions recipe/run_conda_forge_build_setup_osx
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions recipe/run_conda_forge_build_setup_win
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c8d2f58

Please sign in to comment.