From 75554f65db24720d0f58cf21baa1683ac86b752e Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Thu, 2 Nov 2017 15:04:04 -0200 Subject: [PATCH 1/2] rerender --- .circleci/config.yml | 74 ++++++++++++++++++++++++++++++++++ .gitattributes | 2 + README.md | 3 +- ci_support/run_docker_build.sh | 22 ++-------- circle.yml | 19 --------- 5 files changed, 82 insertions(+), 38 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..129213c --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,74 @@ +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_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_35 + - build__CONDA_PY_36 diff --git a/.gitattributes b/.gitattributes index 288029d..974953e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/README.md b/README.md index 3528aaa..4a688b6 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. +For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution: the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) - back to 0. + back to 0. \ No newline at end of file diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index ef556d8..a9dcd59 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -40,6 +40,7 @@ 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 @@ -57,24 +58,9 @@ conda clean --lock conda install --yes --quiet conda-forge-build-setup source run_conda_forge_build_setup -# Embarking on 3 case(s). - set -x - export CONDA_PY=27 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 - - set -x - export CONDA_PY=36 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 +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 diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 421809c..0000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -checkout: - post: - - ./ci_support/fast_finish_ci_pr_build.sh - - ./ci_support/checkout_merge_commit.sh - -machine: - services: - - docker - -dependencies: - # Note, we used to use the naive caching of docker images, but found that it was quicker - # just to pull each time. #rollondockercaching - override: - - docker pull condaforge/linux-anvil - -test: - override: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - - ./ci_support/run_docker_build.sh From 2373f48ac48862b886690cb0ebfad23d79b75cb4 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Thu, 2 Nov 2017 15:04:11 -0200 Subject: [PATCH 2/2] pin geos to 3.6.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d236ec5..8cf5886 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: - basemap-1.0.8dev-datadir.patch build: - number: 2 + number: 3 requirements: build: @@ -19,13 +19,13 @@ requirements: - numpy 1.7.* # [py27] - numpy 1.9.* # [py35] - numpy 1.11.* # [py36] - - geos 3.5.1 + - geos 3.6.2 run: - python - numpy >=1.7 # [py27] - numpy >=1.9 # [py35] - numpy >=1.11 # [py36] - - geos 3.5.1 + - geos 3.6.2 - matplotlib - pyproj - pyshp