diff --git a/appveyor.yml b/.appveyor.yml similarity index 70% rename from appveyor.yml rename to .appveyor.yml index b050452..f34c229 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -9,29 +9,14 @@ environment: secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4 matrix: - - TARGET_ARCH: x86 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda + - CONFIG: win_python2.7 + CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - TARGET_ARCH: x64 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-x64 + - CONFIG: win_python3.5 + CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - TARGET_ARCH: x86 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x86 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36 - - - TARGET_ARCH: x64 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 + - CONFIG: win_python3.6 + CONDA_INSTALL_LOCN: C:\Miniconda36-x64 # We always use a 64-bit machine, but can build x86 distributions @@ -42,7 +27,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py @@ -62,13 +47,13 @@ install: - cmd: conda.exe config --add channels conda-forge # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-build-setup + - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. build: off test_script: - - conda.exe build recipe --quiet + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main + - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml diff --git a/.ci_support/README b/.ci_support/README new file mode 100644 index 0000000..e4e2dce --- /dev/null +++ b/.ci_support/README @@ -0,0 +1 @@ +This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml new file mode 100644 index 0000000..b1b9c03 --- /dev/null +++ b/.ci_support/linux_python2.7.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml new file mode 100644 index 0000000..03eeaff --- /dev/null +++ b/.ci_support/linux_python3.5.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.5' diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml new file mode 100644 index 0000000..315cc0c --- /dev/null +++ b/.ci_support/linux_python3.6.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml new file mode 100644 index 0000000..ac0f5c7 --- /dev/null +++ b/.ci_support/osx_python2.7.yaml @@ -0,0 +1,14 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml new file mode 100644 index 0000000..4c72974 --- /dev/null +++ b/.ci_support/osx_python3.5.yaml @@ -0,0 +1,14 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.5' diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml new file mode 100644 index 0000000..7107c09 --- /dev/null +++ b/.ci_support/osx_python3.6.yaml @@ -0,0 +1,14 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.9' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/win_python2.7.yaml b/.ci_support/win_python2.7.yaml new file mode 100644 index 0000000..fa4b03d --- /dev/null +++ b/.ci_support/win_python2.7.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.11' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/win_python3.5.yaml b/.ci_support/win_python3.5.yaml new file mode 100644 index 0000000..dfca8b5 --- /dev/null +++ b/.ci_support/win_python3.5.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.11' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.5' diff --git a/.ci_support/win_python3.6.yaml b/.ci_support/win_python3.6.yaml new file mode 100644 index 0000000..edd9857 --- /dev/null +++ b/.ci_support/win_python3.6.yaml @@ -0,0 +1,8 @@ +numpy: +- '1.11' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh new file mode 100755 index 0000000..1becc90 --- /dev/null +++ b/.circleci/build_steps.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 + +cat >~/.condarc < /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + echo "Need to set CONFIG env variable" + exit 1 +fi + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" + +docker run -it \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + condaforge/linux-anvil \ + bash \ + /home/conda/feedstock_root/.circleci/build_steps.sh + +# verify that the end of the script was reached +test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..d87090f --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,15 @@ +Thanks for your interest in helping out conda-forge. + +Whether you are brand new or a seasoned maintainer, we always appreciate +feedback from the community about how we can improve conda-forge. If you +are submitting a PR or issue, please fill out the respective template. Should +any questions arise please feel free to ask the maintainer team of the +respective feedstock or reach out to `@conda-forge/core` for more complex +issues. + +In the case of any issues reported, please be sure to demonstrate the relevant +issue (even if it is an absence of a feature). Providing this information will +help busy maintainers understand what it is you hope to accomplish. Also this +will help provide them clues as to what might be going wrong. These examples +can also be reused as tests in the build to ensure further packages meet these +criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..fc95334 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,25 @@ + +Issue: + +
+Environment (conda list): +
+ +``` +$ conda list + +``` +
+ +
+Details about conda and system ( conda info ): +
+ +``` +$ conda info + +``` +
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..d60a25d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,18 @@ + +Checklist +* [ ] Used a fork of the feedstock to propose changes +* [ ] Bumped the build number (if the version is unchanged) +* [ ] Reset the build number to `0` (if the version changed) +* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` +* [ ] Ensured the license file is being packaged. + + + + diff --git a/.gitignore b/.gitignore index 3dc1e2f..c89ecb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.pyc -build_artefacts +build_artifacts diff --git a/.travis.yml b/.travis.yml index b8fffbe..84d4c05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ osx_image: xcode6.4 env: matrix: - - - CONDA_PY=27 - - CONDA_PY=35 - - CONDA_PY=36 + - CONFIG=osx_python2.7 + - CONFIG=osx_python3.5 + - CONFIG=osx_python3.6 + global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "tI0U8y4WrVHIO2GfmDgk8WJlbFibXygsS5Fj3M0hIIfGcjzZGualBeaL0G6Lz55SwMQPSdizbgrCdjqycEYEy6umxZEhMFmylEAsHLnUrJETg8w7iENKUpQbEgzCNeBYwk+r9j0xq5iV1Me/ig9Sc5pZX+LDWLWR38JeVBMlKjMvwOwDYm57A7e5QVldr3TdnPG+B7SIV0PXJSB+aci1blWtVmwVwQ1xqPbFzlnNwpu/j5sWnFONM+CY27RJGreJ2U3h6hUBwC1swr9A0ZjinLAh52sLOKPxT0CWXbrZKqzTPAJyzM4VNkJAN2sT0vmcBvMnfjAACqmeMLZv0pB/XYTU77ZlKbHpba3AyFhaSrp2yoiAhj67vd89Gggz9hxZgrNqooEo+i48n38orOlzx7ux+rk/7SBbIZ3bnokboYbdISr99R8lZ0kZcgBX2e/fy5XNbfxZcq+BpxzcWZMUrjH0dQhqhy/u/TBvZ4v4qQkt+RTPnundMPzHHZIN9aE9u/RFQfnYjXQcUFb8+qeB0B4Fmo07YATNTSuyu41zh4p8ecaS85l/XNidlwmRvRjCZdrdcLz2bNxLZMf+6CX4MiHn+wArSkgXG6cgKxkyoEXInruop1WU/J+dlxnIdJWXVDbtRIXkmuBcdTWMDnTWSgkTNsJfVcraf56hc4CnRv8=" @@ -20,7 +20,7 @@ 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 | \ + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-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. @@ -52,10 +52,10 @@ install: 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 + conda install --yes --quiet conda-forge-ci-setup=1 source run_conda_forge_build_setup script: - - conda build ./recipe + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml - - upload_or_check_non_existence ./recipe conda-forge --channel=main + - upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml diff --git a/LICENSE b/LICENSE.txt similarity index 97% rename from LICENSE rename to LICENSE.txt index 7f5c363..72dc8fd 100644 --- a/LICENSE +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2017, conda-forge +Copyright (c) 2015-2018, 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/README.md b/README.md index 69040a1..58de008 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,16 @@ Summary: Analyse and visualise meteorological and oceanographic data sets. Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/iris-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/iris-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/iris-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/iris-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/iris-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/iris-feedstock/branch/master) +[![Linux](https://img.shields.io/circleci/project/github/conda-forge/iris-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/iris-feedstock) +[![OSX](https://img.shields.io/travis/conda-forge/iris-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/iris-feedstock) +[![Windows](https://img.shields.io/appveyor/ci/conda-forge/iris-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/iris-feedstock/branch/master) Current release info ==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/iris/badges/version.svg)](https://anaconda.org/conda-forge/iris) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/iris/badges/downloads.svg)](https://anaconda.org/conda-forge/iris) + +| Name | Downloads | Version | Platforms | +| --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-iris-green.svg)](https://anaconda.org/conda-forge/iris) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/iris.svg)](https://anaconda.org/conda-forge/iris) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/iris.svg)](https://anaconda.org/conda-forge/iris) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/iris.svg)](https://anaconda.org/conda-forge/iris) | Installing iris =============== diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh deleted file mode 100755 index a9dcd59..0000000 --- a/ci_support/run_docker_build.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -config=$(cat < /dev/null && docker-machine active > /dev/null; then - HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" - -cat << EOF | docker run -i \ - -v "${RECIPE_ROOT}":/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/feedstock_root \ - -e HOST_USER_ID="${HOST_USER_ID}" \ - -e CONDA_PY="${CONDA_PY}" \ - -a stdin -a stdout -a stderr \ - condaforge/linux-anvil \ - bash || exit 1 - -set -e -set +x -export BINSTAR_TOKEN=${BINSTAR_TOKEN} -set -x -export PYTHONUNBUFFERED=1 - -echo "$config" > ~/.condarc -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. -conda clean --lock - -conda install --yes --quiet conda-forge-build-setup -source run_conda_forge_build_setup - -conda build /recipe_root --quiet || exit 1 -upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - -touch /feedstock_root/build_artefacts/conda-forge-build-done -EOF - -# double-check that the build got to the end -# see https://github.com/conda-forge/conda-smithy/pull/337 -# for a possible fix -set -x -test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 03f4f68..322e1a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.0.0" %} +{% set version = "2.1.0" %} package: name: iris @@ -6,30 +6,32 @@ package: source: url: https://github.com/SciTools/iris/archive/v{{ version }}.tar.gz - sha256: 8605ab92c67d622e83fff6d7169fe154d9f8610edd8463b697b574884c158ba2 + sha256: 9e4cc7ebb41efcd67ece39c39d09fcacadc7ae9d2024fe954bb8149e1b9f7570 build: - number: 2 + number: 0 requirements: build: - python - pip - cartopy >=0.14 - - cf_units + - cf_units >=2 + - cftime - dask >=0.17.1 - - numpy + - numpy >=1.14 - pyke - scipy - six run: - python - cartopy >=0.14 - - cf_units + - cf_units >=2 + - cftime - dask >=0.17.1 - - matplotlib + - matplotlib >=2 - netcdf4 <1.4 - - numpy + - numpy >=1.14 - pyke - scipy - six @@ -53,3 +55,4 @@ extra: - rhattersley - ocefpaf - bjlittle + - dkillick