From b4b45d9c5d72b9638adafafe18d1658e371dbf10 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Fri, 22 May 2020 03:57:45 +0000 Subject: [PATCH 1/2] updated v0.1.1 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 028d1bc..3d1047e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pygmt" %} -{% set version = "0.1.0" %} +{% set version = "0.1.1" %} package: name: {{ name|lower }} @@ -7,15 +7,15 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: d95c2825c3bc368b17e6c5c308179a05f4539aaf2fef4379b6c7bb6125882113 + sha256: 7eb1d4957b10b2281376606d7f40896da4d657988e1c93a2d1224750d3e1dbd0 build: number: 0 # TODO : pygmt does not yet work with gmt on Windows, see this PR: # https://github.com/GenericMappingTools/pygmt/pull/313. Once that is merged, # the Windows builds here can likely be enabled. - skip: True # [win] - script: "{{ PYTHON }} -m pip install . -vv" + skip: true # [win] + script: {{ PYTHON }} -m pip install . -vv requirements: host: @@ -40,7 +40,7 @@ about: license: BSD-3-Clause license_family: BSD license_file: LICENSE.txt - summary: 'A Python interface for the Generic Mapping Tools' + summary: A Python interface for the Generic Mapping Tools doc_url: https://www.pygmt.org/ dev_url: https://github.com/GenericMappingTools/pygmt From a98822cd56bddf0a8bb7ec7ba33b6400ef61e079 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Fri, 22 May 2020 03:58:34 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.3, and conda-forge-pinning 2020.05.20.21.21.18 --- .azure-pipelines/azure-pipelines-linux.yml | 15 +++++++++------ .azure-pipelines/azure-pipelines-osx.yml | 14 ++++++++------ .gitattributes | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_docker_build.sh | 4 +++- .scripts/run_osx_build.sh | 3 ++- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a21dfd3..b5de8a2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -6,22 +6,23 @@ jobs: - job: linux pool: vmImage: ubuntu-16.04 - timeoutInMinutes: 360 strategy: - maxParallel: 8 matrix: linux_python3.6.____cpython: CONFIG: linux_python3.6.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 linux_python3.7.____cpython: CONFIG: linux_python3.7.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 linux_python3.8.____cpython: CONFIG: linux_python3.8.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 + maxParallel: 8 + timeoutInMinutes: 360 + steps: # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static @@ -37,4 +38,6 @@ jobs: .scripts/run_docker_build.sh displayName: Run docker build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 65502e5..be31e1e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -6,19 +6,19 @@ jobs: - job: osx pool: vmImage: macOS-10.14 - timeoutInMinutes: 360 strategy: - maxParallel: 8 matrix: osx_python3.6.____cpython: CONFIG: osx_python3.6.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' osx_python3.7.____cpython: CONFIG: osx_python3.7.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' osx_python3.8.____cpython: CONFIG: osx_python3.8.____cpython - UPLOAD_PACKAGES: True + UPLOAD_PACKAGES: 'True' + maxParallel: 8 + timeoutInMinutes: 360 steps: # TODO: Fast finish on azure pipelines? @@ -29,4 +29,6 @@ jobs: ./.scripts/run_osx_build.sh displayName: Run OSX build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index ac943c1..9060b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ bld.bat text eol=crlf .gitattributes linguist-generated=true .gitignore linguist-generated=true .travis.yml linguist-generated=true -.scripts linguist-generated=true +.scripts/* linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5b14787..0df1cd8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -21,7 +21,6 @@ CONDARC conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -32,9 +31,10 @@ make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" +validate_recipe_outputs "pygmt-feedstock" if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + upload_package --validate --feedstock-name="pygmt-feedstock" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 253723c..360fc69 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -60,7 +60,7 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ @@ -69,6 +69,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ $DOCKER_IMAGE \ bash \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 775799b..f5b5573 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -48,8 +48,9 @@ set -e echo -e "\n\nMaking the build clobber file and running the build." make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml +validate_recipe_outputs "pygmt-feedstock" if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then echo -e "\n\nUploading the packages." - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + upload_package --validate --feedstock-name="pygmt-feedstock" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi \ No newline at end of file