Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to the new Jinja2 compiler syntax (#51)
I tracked a segfault on Linux to a bug in GMT that crashed when the path names were too long (like the conda placehold_... prefixes). This is fixed in PR #52 for the devel branch and will be backported to 5.4.5 which should come out soon. For now, I tested the built packaged on the Docker container locally and it works fine. I'll comment out the tests for now to get this built and will put them back with the new release.
- Loading branch information
Showing
18 changed files
with
248 additions
and
109 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. |
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 @@ | ||
| c_compiler: | ||
| - toolchain_c | ||
| curl: | ||
| - '7.59' | ||
| gdal: | ||
| - '2.2' | ||
| hdf5: | ||
| - 1.10.2 | ||
| libnetcdf: | ||
| - '4.6' | ||
| openblas: | ||
| - 0.2.20 | ||
| pin_run_as_build: | ||
| curl: | ||
| max_pin: x | ||
| gdal: | ||
| max_pin: x.x | ||
| hdf5: | ||
| max_pin: x.x.x | ||
| libnetcdf: | ||
| max_pin: x.x | ||
| openblas: | ||
| max_pin: x.x.x | ||
| zlib: | ||
| max_pin: x.x | ||
| zlib: | ||
| - '1.2' |
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,33 @@ | ||
| MACOSX_DEPLOYMENT_TARGET: | ||
| - '10.9' | ||
| c_compiler: | ||
| - toolchain_c | ||
| curl: | ||
| - '7.59' | ||
| gdal: | ||
| - '2.2' | ||
| hdf5: | ||
| - 1.10.2 | ||
| libnetcdf: | ||
| - '4.6' | ||
| macos_machine: | ||
| - x86_64-apple-darwin13.4.0 | ||
| macos_min_version: | ||
| - '10.9' | ||
| openblas: | ||
| - 0.2.20 | ||
| pin_run_as_build: | ||
| curl: | ||
| max_pin: x | ||
| gdal: | ||
| max_pin: x.x | ||
| hdf5: | ||
| max_pin: x.x.x | ||
| libnetcdf: | ||
| max_pin: x.x | ||
| openblas: | ||
| max_pin: x.x.x | ||
| zlib: | ||
| max_pin: x.x | ||
| zlib: | ||
| - '1.2' |
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,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 <<CONDARC | ||
| channels: | ||
| - conda-forge | ||
| - defaults | ||
| conda-build: | ||
| root-dir: /home/conda/feedstock_root/build_artifacts | ||
| show_channel_urls: true | ||
| CONDARC | ||
|
|
||
| # A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. | ||
| conda clean --lock | ||
|
|
||
| conda install --yes --quiet conda-forge-ci-setup=1 conda-build | ||
| source run_conda_forge_build_setup | ||
|
|
||
| conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet | ||
| upload_or_check_non_existence /home/conda/recipe_root conda-forge --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml | ||
|
|
||
| touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" |
File renamed without changes.
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 |
|---|---|---|
| @@ -1,24 +1,26 @@ | ||
| version: 2 | ||
|
|
||
| jobs: | ||
| build: | ||
| build_linux_: | ||
| working_directory: ~/test | ||
| machine: true | ||
| environment: | ||
| - CONFIG: "linux_" | ||
| 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 | ||
| ./.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: ./ci_support/run_docker_build.sh | ||
| command: ./.circleci/run_docker_build.sh | ||
|
|
||
| workflows: | ||
| version: 2 | ||
| build_and_test: | ||
| jobs: | ||
| - build | ||
| - build_linux_ |
2 changes: 1 addition & 1 deletion
2
ci_support/fast_finish_ci_pr_build.sh → .circleci/fast_finish_ci_pr_build.sh
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/bin/bash | ||
|
|
||
| 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 "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" |
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,47 @@ | ||
| #!/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 | ||
|
|
||
| FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) | ||
| RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe | ||
|
|
||
| docker info | ||
|
|
||
| # In order for the conda-build process in the container to write to the mounted | ||
| # volumes, we need to run with the same id as the host machine, which is | ||
| # normally the owner of the mounted volumes, or at least has write permission | ||
| export HOST_USER_ID=$(id -u) | ||
| # Check if docker-machine is being used (normally on OSX) and get the uid from | ||
| # the VM | ||
| if hash docker-machine 2> /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" |
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 |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| *.pyc | ||
|
|
||
| build_artefacts | ||
| 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
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
Oops, something went wrong.