From d4a9398fad0b5bc3f5f28cb14cb9f7a4b04eb8c9 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Thu, 15 Sep 2016 06:37:26 -0300 Subject: [PATCH 1/2] rerender --- .travis.yml | 14 ++++++-------- README.md | 27 ++++++++++++++++----------- appveyor.yml | 12 ++++-------- ci_support/run_docker_build.sh | 6 ++---- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index b983c13..827ac43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yaml and/or the recipe/meta.yaml. -language: objective-c +language: generic + +os: osx env: matrix: @@ -28,16 +30,12 @@ install: 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=1.20.0 jinja2 anaconda-client conda config --add channels conda-forge - + conda config --set show_channel_urls true + conda install --yes --quiet conda-forge-build-setup + source run_conda_forge_build_setup script: - conda build ./recipe -after_success: - - ./ci_support/upload_or_check_non_existence.py ./recipe conda-forge --channel=main diff --git a/README.md b/README.md index e4b06d3..e8b48e3 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ About conda-forge conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the -conda-forge GitHub organization. The conda-forge organization contains one repository +conda-forge GitHub organization. The conda-forge organization contains one repository for each of the installable packages. Such a repository is known as a *feedstock*. A feedstock is made up of a conda recipe (the instructions on what and how to build @@ -70,9 +70,9 @@ Terminology Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/cf_units-feedstock.svg?style=svg)](https://circleci.com/gh/conda-forge/cf_units-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/cf_units-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/cf_units-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/cf-units-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/cf-units-feedstock/branch/master) +Linux: [![Circle CI](https://circleci.com/gh/conda-forge/cf_units-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/cf_units-feedstock) +OSX: [![TravisCI](https://travis-ci.org/conda-forge/cf_units-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/cf_units-feedstock) +Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/cf_units-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/cf-units-feedstock/branch/master) Current release info ==================== @@ -83,16 +83,21 @@ Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/cf_units/b Updating cf_units-feedstock =========================== -If you would like to improve the cf_units recipe, please take the normal -route of forking this repository and submitting a PR. Upon submission, your changes will -be run on the appropriate platforms to give the reviewer an opportunity to confirm that the -changes result in a successful build. Once merged, the recipe will be re-built and uploaded -automatically to the conda-forge channel, whereupon they will be available for everybody to -install and use. +If you would like to improve the cf_units recipe or build a new +package version, please fork this repository and submit a PR. Upon submission, +your changes will be run on the appropriate platforms to give the reviewer an +opportunity to confirm that the changes result in a successful build. Once +merged, the recipe will be re-built and uploaded automatically to the +`conda-forge` channel, whereupon the built conda packages will be available for +everybody to install and use from the `conda-forge` channel. +Note that all branches in the conda-forge/cf_units-feedstock are +immediately built and any created packages are uploaded, so PRs should be based +on branches in forks and branches in the main repository should only be used to +build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). + the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) back to 0. diff --git a/appveyor.yml b/appveyor.yml index fbfa9d3..bd534b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # This file was automatically generated by conda-smithy. To update a component of this # file, make changes to conda-forge.yaml and/or recipe/meta.yaml, and run -# "conda-smithy regenerate". +# "conda smithy rerender". environment: @@ -58,18 +58,14 @@ install: - cmd: rmdir C:\cygwin /s /q - appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py" - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci - - cmd: set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH% + - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - cmd: set PYTHONUNBUFFERED=1 - cmd: conda config --set show_channel_urls true - cmd: conda install -c pelson/channel/development --yes --quiet obvious-ci - cmd: conda config --add channels conda-forge - - cmd: conda info - - cmd: conda install -n root --quiet --yes conda-build anaconda-client jinja2 setuptools - # Workaround for Python 3.4 and x64 bug in latest conda-build. - # 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-forge-build-setup + - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. build: off diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index c8af217..203b1fe 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -14,7 +14,6 @@ config=$(cat < ~/.condarc # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. conda clean --lock -conda update --yes --all -conda install --yes conda-build -conda info +conda install --yes --quiet conda-forge-build-setup +source run_conda_forge_build_setup # Embarking on 3 case(s). set -x From 54cba4877165167cf659e16ac88d15b76bb83d94 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Thu, 15 Sep 2016 06:37:41 -0300 Subject: [PATCH 2/2] Update to 1.1.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fcf04c2..6ff4ca2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.1.1" %} +{% set version = "1.1.2" %} package: name: cf_units @@ -7,7 +7,7 @@ package: source: fn: cf_units-{{ version }}.tar.gz url: https://github.com/SciTools/cf_units/archive/v{{ version }}.tar.gz - sha256: 92981e0aa1cb97cf6b737335910c8be88dc095e879ca8405b26f61c3e2d02e6a + sha256: 6b277069f29c7dd1b752425ac6dd19ebf52314872779f7f8c9370ba1d6e4f406 build: number: 0 @@ -30,7 +30,7 @@ test: about: home: http://www.scitools.org.uk/iris license: GNU Lesser General Public License - summary: Units of measure as required by the Climate and Forecast (CF) metadata conventions. + summary: 'Units of measure as required by the Climate and Forecast (CF) metadata conventions.' extra: recipe-maintainers: