Merge pull request #2 from conda-forge-admin/feedstock_rerender_master

MNT: Re-render the feedstock
conda-forge · May 17, 2016 · 960c89a · 960c89a
2 parents a5a97b7 + a108aa3
commit 960c89a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,17 +9,24 @@ env:
     - secure: "ektzAjZME+jVPjwSqQxNGL/PYkVbcpF9cOPp66QMY318ukIBhhzDX1n6fHC2QYBnY6ujQd3tFIOdwq+39kDmCefqxR1M3k7yP6nfx/YTGjQ2+NLbuXAjoaL28/STfiD036YSFQSNi7/xsaYmVx3Rb3xpHuwNKhodExrrQJRUniqsT5MuJRePhcG+/pmvGcofLusaEtN0Tagh2VMIr1QBMmOZmQZ6vbRCpgAUv88Qrev7LPsE5IlWxn+is7PrqxEE6Y0yydmQxGE7+dsnrFNgx6hJdD71//a0Up+qPVD5867Ud257ao+vxLi+iOkDGuOsmUVc+TPoqdg7W4N91WQxUdOH2v42glE9mJy8W7rAlaVdCz93zP2E5cilQeTYOlg7ok5rav/fmTgVUTUSRqdWAQahAlfHU2qtDrv2HTeYXaDg/kouuFONRq/CEukrPTkb12Bd7APdRF6V4n+qqXYeaz9JpgEyyuzDk5Ubd27KFFOI1UArO7nDV/eJM7vBzKWBY+YB7tQrG3gvSKrcCzvOGnAQQJtWT5y2ppjlYkBiuVAAqklcLrG5A+wo0h/a1BlwPem1wy4iLdoRpTVqjwVcZfjq2iKGP4f5ErfGEh/uQ498fir/Xo8a6GkdldMTes/cz6qDNb3HgH4mTzGnG2QRjZh16BTYbHFjfSgHICmUHts="
 
 
+before_install:
+    # Remove homebrew.
+    - brew remove --force $(brew list)
+    - brew cleanup -s
+    - rm -rf $(brew --cache)
+
 install:
     - |
       MINICONDA_URL="http://repo.continuum.io/miniconda"
       MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
-      wget "${MINICONDA_URL}/${MINICONDA_FILE}"
+      curl -O "${MINICONDA_URL}/${MINICONDA_FILE}"
       bash $MINICONDA_FILE -b
 
       export PATH=/Users/travis/miniconda3/bin:$PATH
 
+      conda config --set show_channel_urls true
       conda update --yes conda
-      conda install --yes conda-build jinja2 anaconda-client
+      conda install --yes conda-build=1.20.0 jinja2 anaconda-client
       conda config --add channels conda-forge
       
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Home: http://www.multiprecision.org/
 
 Package license: LGPL 3
 
-Feedstock license: BSD
+Feedstock license: BSD 3-Clause
 
 Summary: A C library for the arithmetic of complex numbers with arbitrarily high precision.
 
@@ -69,6 +69,7 @@ Terminology
 
 Current build status
 ====================
+
 Linux: [![Circle CI](https://circleci.com/gh/conda-forge/mpc-feedstock.svg?style=svg)](https://circleci.com/gh/conda-forge/mpc-feedstock)
 OSX: [![TravisCI](https://travis-ci.org/conda-forge/mpc-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/mpc-feedstock) 
 Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/mpc-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/mpc-feedstock/branch/master)

diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh
@@ -20,7 +20,7 @@ channels:
 conda-build:
  root-dir: /feedstock_root/build_artefacts
 
-show_channel_urls: True
+show_channel_urls: true
 
 CONDARC
 )
@@ -29,7 +29,7 @@ cat << EOF | docker run -i \
                         -v ${RECIPE_ROOT}:/recipe_root \
                         -v ${FEEDSTOCK_ROOT}:/feedstock_root \
                         -a stdin -a stdout -a stderr \
-                        pelson/obvious-ci:latest_x64 \
+                        condaforge/linux-anvil \
                         bash || exit $?
 
 export BINSTAR_TOKEN=${BINSTAR_TOKEN}
@@ -40,7 +40,7 @@ echo "$config" > ~/.condarc
 conda clean --lock
 
 conda update --yes --all
-conda install --yes conda-build==1.18.2
+conda install --yes conda-build
 conda info
 
 # Embarking on 1 case(s).

diff --git a/circle.yml b/circle.yml
@@ -6,8 +6,7 @@ dependencies:
   # Note, we used to use the naive caching of docker images, but found that it was quicker
   # just to pull each time. #rollondockercaching
   override:
-    - docker pull pelson/obvious-ci:latest_x64
-#    - docker pull pelson/conda32_obvious_ci
+    - docker pull condaforge/linux-anvil
 
 test:
   override: