-
-
Notifications
You must be signed in to change notification settings - Fork 9
Sane numpy #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Sane numpy #1
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
efdc038
use sane numpy configuration
kain88-de 09bee3e
MNT: Re-rendered with conda-smithy 2.3.3
kain88-de 97a1b7f
add python 3.4 to build matrix
kain88-de 475b9c9
increase build number
kain88-de b1ffae6
ensure we load modules with compiled numpy dependencies
kain88-de 5608d5a
fix appveyor
kain88-de 6cb5091
add more packages to test
kain88-de efa072b
windows doesn't seem to support python 3.4
kain88-de 928fcd6
Update meta.yaml
ocefpaf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,96 @@ | ||
| version: 2 | ||
|
|
||
| jobs: | ||
| build__CONDA_PY_27: | ||
| working_directory: ~/test | ||
| machine: true | ||
| environment: | ||
| - CONDA_PY: "27" | ||
| steps: | ||
| - checkout | ||
| - run: | ||
| name: Fast finish outdated PRs and merge PRs | ||
| command: | | ||
| ./ci_support/fast_finish_ci_pr_build.sh | ||
| ./ci_support/checkout_merge_commit.sh | ||
| - run: | ||
| command: docker pull condaforge/linux-anvil | ||
| - run: | ||
| name: Print conda-build environment variables | ||
| command: | | ||
| echo "CONDA_PY=${CONDA_PY}" | ||
| - run: | ||
| # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. | ||
| command: ./ci_support/run_docker_build.sh | ||
| build__CONDA_PY_34: | ||
| working_directory: ~/test | ||
| machine: true | ||
| environment: | ||
| - CONDA_PY: "34" | ||
| steps: | ||
| - checkout | ||
| - run: | ||
| name: Fast finish outdated PRs and merge PRs | ||
| command: | | ||
| ./ci_support/fast_finish_ci_pr_build.sh | ||
| ./ci_support/checkout_merge_commit.sh | ||
| - run: | ||
| command: docker pull condaforge/linux-anvil | ||
| - run: | ||
| name: Print conda-build environment variables | ||
| command: | | ||
| echo "CONDA_PY=${CONDA_PY}" | ||
| - run: | ||
| # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. | ||
| command: ./ci_support/run_docker_build.sh | ||
| build__CONDA_PY_35: | ||
| working_directory: ~/test | ||
| machine: true | ||
| environment: | ||
| - CONDA_PY: "35" | ||
| steps: | ||
| - checkout | ||
| - run: | ||
| name: Fast finish outdated PRs and merge PRs | ||
| command: | | ||
| ./ci_support/fast_finish_ci_pr_build.sh | ||
| ./ci_support/checkout_merge_commit.sh | ||
| - run: | ||
| command: docker pull condaforge/linux-anvil | ||
| - run: | ||
| name: Print conda-build environment variables | ||
| command: | | ||
| echo "CONDA_PY=${CONDA_PY}" | ||
| - run: | ||
| # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. | ||
| command: ./ci_support/run_docker_build.sh | ||
| build__CONDA_PY_36: | ||
| working_directory: ~/test | ||
| machine: true | ||
| environment: | ||
| - CONDA_PY: "36" | ||
| steps: | ||
| - checkout | ||
| - run: | ||
| name: Fast finish outdated PRs and merge PRs | ||
| command: | | ||
| ./ci_support/fast_finish_ci_pr_build.sh | ||
| ./ci_support/checkout_merge_commit.sh | ||
| - run: | ||
| command: docker pull condaforge/linux-anvil | ||
| - run: | ||
| name: Print conda-build environment variables | ||
| command: | | ||
| echo "CONDA_PY=${CONDA_PY}" | ||
| - run: | ||
| # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. | ||
| command: ./ci_support/run_docker_build.sh | ||
|
|
||
| workflows: | ||
| version: 2 | ||
| build_and_test: | ||
| jobs: | ||
| - build__CONDA_PY_27 | ||
| - build__CONDA_PY_34 | ||
| - build__CONDA_PY_35 | ||
| - build__CONDA_PY_36 |
This file contains hidden or 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 |
|---|---|---|
| @@ -1,5 +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 hidden or 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 hidden or 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 hidden or 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 contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kain88-de I guess that this is the current combination. I don't really want to spread this at the moment. I'd rather work fast to get older versions of
numpyin the channel so we can simplify this ASAP.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can wait for numpy 1.8 on windows. I rather have a correct long-term solution for the maintainers. I also changed these to see if I can break things in the build ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool. We'll have a meeting next Friday and I'll try to ask for a numpy 1.8 and 1.9 on
defaultsfor both py35 and py36.