-
-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #65 from ReimarBauer/master
reshape array of size 1 into shape (7,) needs cftime >=1.0.1, fixes #58
- Loading branch information
Showing
14 changed files
with
111 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. :) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<!-- | ||
Thanks for reporting your issue. | ||
Please fill out the sections below. | ||
--> | ||
Issue: | ||
|
||
<br/> | ||
Environment (<code>conda list</code>): | ||
<details> | ||
|
||
``` | ||
$ conda list | ||
``` | ||
</details> | ||
|
||
<br/> | ||
Details about <code>conda</code> and system ( <code>conda info</code> ): | ||
<details> | ||
|
||
``` | ||
$ conda info | ||
``` | ||
</details> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<!-- | ||
Thank you for pull request. | ||
Below are a few things we ask you kindly to self-check before getting a review. Remove checks that are not relevant. | ||
--> | ||
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 <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering) | ||
* [ ] Ensured the license file is being packaged. | ||
|
||
<!-- | ||
Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ): | ||
--> | ||
|
||
<!-- | ||
Please add any other relevant info below: | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
*.pyc | ||
|
||
build_artifacts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters