From 49eba7bc2881e79691cb3e5d5685babace440a73 Mon Sep 17 00:00:00 2001 From: Reimar Bauer Date: Sun, 7 Oct 2018 12:15:53 +0200 Subject: [PATCH 1/4] reshape array of size 1 into shape (7,) needs cftime >=1.0.1, fixes #58 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 575d79f..218890a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ requirements: - pip - numpy - cython >=0.19 - - cftime + - cftime >=1.0.1 - hdf5 - libnetcdf run: From 7ca8eefe2315979c2efc63216d1534ee854e6000 Mon Sep 17 00:00:00 2001 From: Reimar Bauer Date: Sun, 7 Oct 2018 12:17:43 +0200 Subject: [PATCH 2/4] increased build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 218890a..1e48116 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403 build: - number: 0 + number: 1 entry_points: - ncinfo = netCDF4.utils:ncinfo - nc4tonc3 = netCDF4.utils:nc4tonc3 From 840ebddc107d6eb162a8abc19fac348a495ccb8d Mon Sep 17 00:00:00 2001 From: Reimar Bauer Date: Sun, 7 Oct 2018 12:24:44 +0200 Subject: [PATCH 3/4] MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.03 --- .appveyor.yml | 3 -- .ci_support/linux_python3.5.yaml | 24 ---------------- .ci_support/osx_python3.5.yaml | 28 ------------------- .../win_c_compilervs2015python3.5.yaml | 25 ----------------- .circleci/config.yml | 18 ------------ .travis.yml | 1 - recipe/.circleci/checkout_merge_commit.sh | 27 ++++++++++++++++++ recipe/.gitattributes | 7 +++++ recipe/.github/CONTRIBUTING.md | 15 ++++++++++ recipe/.github/ISSUE_TEMPLATE.md | 25 +++++++++++++++++ recipe/.github/PULL_REQUEST_TEMPLATE.md | 18 ++++++++++++ recipe/.gitignore | 3 ++ recipe/LICENSE.txt | 13 +++++++++ 13 files changed, 108 insertions(+), 99 deletions(-) delete mode 100644 .ci_support/linux_python3.5.yaml delete mode 100644 .ci_support/osx_python3.5.yaml delete mode 100644 .ci_support/win_c_compilervs2015python3.5.yaml create mode 100755 recipe/.circleci/checkout_merge_commit.sh create mode 100644 recipe/.gitattributes create mode 100644 recipe/.github/CONTRIBUTING.md create mode 100644 recipe/.github/ISSUE_TEMPLATE.md create mode 100644 recipe/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 recipe/.gitignore create mode 100644 recipe/LICENSE.txt diff --git a/.appveyor.yml b/.appveyor.yml index 5e00e4e..cbd808a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,9 +12,6 @@ environment: - CONFIG: win_c_compilervs2008python2.7 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_c_compilervs2015python3.5 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_c_compilervs2015python3.6 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml deleted file mode 100644 index 4d7309a..0000000 --- a/.ci_support/linux_python3.5.yaml +++ /dev/null @@ -1,24 +0,0 @@ -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -hdf5: -- 1.10.3 -libnetcdf: -- '4.6' -numpy: -- '1.9' -pin_run_as_build: - hdf5: - max_pin: x.x.x - libnetcdf: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml deleted file mode 100644 index 3e92cda..0000000 --- a/.ci_support/osx_python3.5.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -hdf5: -- 1.10.3 -libnetcdf: -- '4.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - hdf5: - max_pin: x.x.x - libnetcdf: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/win_c_compilervs2015python3.5.yaml b/.ci_support/win_c_compilervs2015python3.5.yaml deleted file mode 100644 index a7fe39c..0000000 --- a/.ci_support/win_c_compilervs2015python3.5.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -hdf5: -- 1.10.3 -libnetcdf: -- '4.6' -numpy: -- '1.11' -pin_run_as_build: - hdf5: - max_pin: x.x.x - libnetcdf: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' -zip_keys: -- - python - - c_compiler diff --git a/.circleci/config.yml b/.circleci/config.yml index 0047203..e4524f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,23 +18,6 @@ jobs: - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_python3.5: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.5" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh build_linux_python3.6: working_directory: ~/test machine: true @@ -75,6 +58,5 @@ workflows: build_and_test: jobs: - build_linux_python2.7 - - build_linux_python3.5 - build_linux_python3.6 - build_linux_python3.7 diff --git a/.travis.yml b/.travis.yml index ce8ae38..04108bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ osx_image: xcode6.4 env: matrix: - CONFIG=osx_python2.7 - - CONFIG=osx_python3.5 - CONFIG=osx_python3.6 - CONFIG=osx_python3.7 diff --git a/recipe/.circleci/checkout_merge_commit.sh b/recipe/.circleci/checkout_merge_commit.sh new file mode 100755 index 0000000..9528e4b --- /dev/null +++ b/recipe/.circleci/checkout_merge_commit.sh @@ -0,0 +1,27 @@ +#!/bin/bash + + +# Update PR refs for testing. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" + FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" +fi + +# Retrieve the refs. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + git fetch -u origin ${FETCH_REFS} +fi + +# Checkout the PR merge ref. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" +fi + +# Check for merge conflicts. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null +fi diff --git a/recipe/.gitattributes b/recipe/.gitattributes new file mode 100644 index 0000000..974953e --- /dev/null +++ b/recipe/.gitattributes @@ -0,0 +1,7 @@ +* text=auto + +*.patch binary +*.diff binary +meta.yaml text eol=lf +build.sh text eol=lf +bld.bat text eol=crlf diff --git a/recipe/.github/CONTRIBUTING.md b/recipe/.github/CONTRIBUTING.md new file mode 100644 index 0000000..d87090f --- /dev/null +++ b/recipe/.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/recipe/.github/ISSUE_TEMPLATE.md b/recipe/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..fc95334 --- /dev/null +++ b/recipe/.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/recipe/.github/PULL_REQUEST_TEMPLATE.md b/recipe/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..047fdaf --- /dev/null +++ b/recipe/.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` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) +* [ ] Ensured the license file is being packaged. + + + + diff --git a/recipe/.gitignore b/recipe/.gitignore new file mode 100644 index 0000000..c89ecb7 --- /dev/null +++ b/recipe/.gitignore @@ -0,0 +1,3 @@ +*.pyc + +build_artifacts diff --git a/recipe/LICENSE.txt b/recipe/LICENSE.txt new file mode 100644 index 0000000..72dc8fd --- /dev/null +++ b/recipe/LICENSE.txt @@ -0,0 +1,13 @@ +BSD 3-clause license +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: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 8686b0109dfda07e094b3300f52b090417bb292d Mon Sep 17 00:00:00 2001 From: Reimar Bauer Date: Sun, 7 Oct 2018 13:03:01 +0200 Subject: [PATCH 4/4] for now skip python3.7, cftime 1.0.1 is not available --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e48116..128efa0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,6 +9,7 @@ source: sha256: d4fc65b98e348c39d082ab6b4b7f6d636b1b4e63bec016e5bca189fee5d46403 build: + skip: true # [py37] number: 1 entry_points: - ncinfo = netCDF4.utils:ncinfo