From d6d7ec262dbfb654c3c59ccbeb34b49f115a569d Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Mon, 13 Mar 2017 01:38:34 +0000 Subject: [PATCH] MNT: Updated the feedstock for conda-smithy version 2.1.1. --- .travis.yml | 29 ++++++++++++++++++----- LICENSE | 2 +- ci_support/fast_finish_ci_pr_build.sh | 4 ++++ ci_support/run_docker_build.sh | 33 ++++++++++++--------------- circle.yml | 1 + 5 files changed, 43 insertions(+), 26 deletions(-) create mode 100755 ci_support/fast_finish_ci_pr_build.sh diff --git a/.travis.yml b/.travis.yml index 0c76b9d..36431d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,13 @@ language: generic os: osx -osx_image: beta-xcode6.1 +osx_image: xcode6.4 env: matrix: - HDF5_VERSION="1.8.16|1.8.16.*" CONDA_PY=27 - HDF5_VERSION="1.8.17|1.8.17.*" CONDA_PY=27 - - HDF5_VERSION="1.8.16|1.8.16.*" CONDA_PY=34 - - HDF5_VERSION="1.8.17|1.8.17.*" CONDA_PY=34 - HDF5_VERSION="1.8.16|1.8.16.*" CONDA_PY=35 - HDF5_VERSION="1.8.17|1.8.17.*" CONDA_PY=35 global: @@ -21,19 +19,38 @@ env: before_install: + # Fast finish the PR. + - | + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 + # Remove homebrew. - - brew remove --force $(brew list) - - brew cleanup -s - - rm -rf $(brew --cache) + - | + echo "" + echo "Removing homebrew from Travis CI to avoid conflicts." + curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew + chmod +x ~/uninstall_homebrew + ~/uninstall_homebrew -fq + rm ~/uninstall_homebrew + install: + # Install Miniconda. - | + echo "" + echo "Installing a fresh version of Miniconda." MINICONDA_URL="https://repo.continuum.io/miniconda" MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" bash $MINICONDA_FILE -b + # Configure conda. + - | + echo "" + echo "Configuring conda." source /Users/travis/miniconda3/bin/activate root + conda config --remove channels defaults + conda config --add channels defaults conda config --add channels conda-forge conda config --set show_channel_urls true conda install --yes --quiet conda-forge-build-setup diff --git a/LICENSE b/LICENSE index 04ad21b..7f5c363 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) conda-forge +Copyright (c) 2015-2017, conda-forge All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/ci_support/fast_finish_ci_pr_build.sh b/ci_support/fast_finish_ci_pr_build.sh new file mode 100755 index 0000000..463c27f --- /dev/null +++ b/ci_support/fast_finish_ci_pr_build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index 7401bbd..79d973e 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -14,7 +14,7 @@ config=$(cat <