From 7acc9fc4ccff9e04d06c00b0de55e273b47494a5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 24 Jan 2021 23:03:10 +0000 Subject: [PATCH 1/3] updated v1.2.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 446b755..6f7d0f5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.1.8" %} +{% set version = "1.2.0" %} package: name: rasterio @@ -6,7 +6,7 @@ package: source: url: https://github.com/mapbox/rasterio/archive/{{ version }}.tar.gz - sha256: e2562ddf77d591bc94b21b041b2b72b54648f541d79dc2dfbdfcb64c2d7b92e5 + sha256: 7c28542869ecce11a1f89d11b63eb48e4f56dd43800897a01519f4728e286067 build: number: 0 From 6f24e26ca290effe68f0560b9a5d1d5f0d2821b8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 24 Jan 2021 23:03:22 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and conda-forge-pinning 2021.01.24.19.22.01 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++---- .../linux_64_numpy1.16python3.6.____cpython.yaml | 8 +++++--- .../linux_64_numpy1.16python3.7.____cpython.yaml | 8 +++++--- .../linux_64_numpy1.16python3.8.____cpython.yaml | 8 +++++--- .../linux_64_numpy1.19python3.9.____cpython.yaml | 8 +++++--- .ci_support/migrations/gdal31.yaml | 9 --------- .../osx_64_numpy1.16python3.6.____cpython.yaml | 4 ++-- .../osx_64_numpy1.16python3.7.____cpython.yaml | 4 ++-- .../osx_64_numpy1.16python3.8.____cpython.yaml | 4 ++-- .../osx_64_numpy1.19python3.9.____cpython.yaml | 4 ++-- .scripts/run_docker_build.sh | 12 ++++++++---- 11 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 .ci_support/migrations/gdal31.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 85c1a9c..706a4de 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,19 +11,19 @@ jobs: linux_64_numpy1.16python3.6.____cpython: CONFIG: linux_64_numpy1.16python3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.16python3.7.____cpython: CONFIG: linux_64_numpy1.16python3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.16python3.8.____cpython: CONFIG: linux_64_numpy1.16python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.19python3.9.____cpython: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml index 43fbe1e..1da5a57 100644 --- a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 libgdal: - '3.1' numpy: @@ -31,5 +31,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml index f6c8825..dc387ae 100644 --- a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 libgdal: - '3.1' numpy: @@ -31,5 +31,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml index a851e88..b2aff7f 100644 --- a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 libgdal: - '3.1' numpy: @@ -31,5 +31,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 2a75188..16a3840 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' cdt_name: - cos6 channel_sources: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 libgdal: - '3.1' numpy: @@ -31,5 +31,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/migrations/gdal31.yaml b/.ci_support/migrations/gdal31.yaml deleted file mode 100644 index 992d2ed..0000000 --- a/.ci_support/migrations/gdal31.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -gdal: -- '3.1' -libgdal: -- '3.1' -migrator_ts: 1589741512.6218328 diff --git a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml index 63dae76..b9722fa 100644 --- a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' libgdal: - '3.1' macos_machine: diff --git a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml index e3f1a15..eec0da6 100644 --- a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' libgdal: - '3.1' macos_machine: diff --git a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml index 43e141b..07a7746 100644 --- a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' libgdal: - '3.1' macos_machine: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 375e29d..f3c6bdc 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' libgdal: - '3.1' macos_machine: diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..36dacd6 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ From 9da7cc598e6de00ad3d0bc90d62b33556dbb5cee Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Sun, 24 Jan 2021 20:01:34 -0600 Subject: [PATCH 3/3] add shapely dependency to tests --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6f7d0f5..0cf7dc4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,6 +47,7 @@ test: - matplotlib-base - packaging - hypothesis + - shapely files: - test_data/test.tif imports: