From 0ceb745b985f8bed0edd355c36232eadd2d9b1a0 Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 09:48:25 -0500 Subject: [PATCH 01/12] remove un-needed patch for 0.20 --- recipe/gh1833_update_ne_url.patch | 15 --------------- recipe/meta.yaml | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 recipe/gh1833_update_ne_url.patch diff --git a/recipe/gh1833_update_ne_url.patch b/recipe/gh1833_update_ne_url.patch deleted file mode 100644 index 5a4fd26..0000000 --- a/recipe/gh1833_update_ne_url.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/cartopy/io/shapereader.py b/lib/cartopy/io/shapereader.py -index 795b202c..386004fc 100644 ---- a/lib/cartopy/io/shapereader.py -+++ b/lib/cartopy/io/shapereader.py -@@ -297,8 +297,8 @@ class NEShpDownloader(Downloader): - # Define the NaturalEarth URL template. The natural earth website - # returns a 302 status if accessing directly, so we use the naciscdn - # URL directly. -- _NE_URL_TEMPLATE = ('https://naciscdn.org/naturalearth/{resolution}' -- '/{category}/ne_{resolution}_{name}.zip') -+ _NE_URL_TEMPLATE = ('https://naturalearth.s3.amazonaws.com/' -+ '{resolution}_{category}/ne_{resolution}_{name}.zip') - - def __init__(self, - url_template=_NE_URL_TEMPLATE, diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a019583..dff8ab9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,8 +7,6 @@ package: source: url: https://pypi.io/packages/source/C/Cartopy/Cartopy-{{ version }}.tar.gz sha256: 4b8b4773a98ed7009fe17d9b6ec87ac3ac62b7d14634d7768c190eadc647d576 - patches: - - gh1833_update_ne_url.patch build: error_overlinking: true From 4b5967b3cd5f2d812ae09840763d7386d1131251 Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 09:50:02 -0500 Subject: [PATCH 02/12] make 0.20.0 release --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dff8ab9..4c47b23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.19.0.post1" %} +{% set version = "0.20.0" %} package: name: cartopy @@ -6,11 +6,11 @@ package: source: url: https://pypi.io/packages/source/C/Cartopy/Cartopy-{{ version }}.tar.gz - sha256: 4b8b4773a98ed7009fe17d9b6ec87ac3ac62b7d14634d7768c190eadc647d576 + sha256: eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a build: error_overlinking: true - number: 1 + number: 0 requirements: build: From 6ba9ffcc81685e62eda558f85f8739505d377c8a Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 17 Sep 2021 14:53:51 +0000 Subject: [PATCH 03/12] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.17.05.51.46 --- .azure-pipelines/azure-pipelines-linux.yml | 18 +++---- .azure-pipelines/azure-pipelines-osx.yml | 15 +++--- .azure-pipelines/azure-pipelines-win.yml | 14 +++--- ...nux_64_numpy1.18python3.6.____73_pypy.yaml | 37 -------------- ...ux_64_numpy1.18python3.6.____cpython.yaml} | 4 +- ...ux_64_numpy1.18python3.7.____cpython.yaml} | 4 +- ...ux_64_numpy1.18python3.8.____cpython.yaml} | 4 +- ...nux_64_numpy1.19python3.7.____73_pypy.yaml | 2 +- ...nux_64_numpy1.19python3.9.____cpython.yaml | 2 +- .ci_support/migrations/pypy.yaml | 34 ------------- ...osx_64_numpy1.18python3.6.____73_pypy.yaml | 35 ------------- ...sx_64_numpy1.18python3.6.____cpython.yaml} | 4 +- ...sx_64_numpy1.18python3.7.____cpython.yaml} | 4 +- ...sx_64_numpy1.18python3.8.____cpython.yaml} | 4 +- ...osx_64_numpy1.19python3.7.____73_pypy.yaml | 2 +- ...osx_64_numpy1.19python3.9.____cpython.yaml | 2 +- .../osx_arm64_python3.8.____cpython.yaml | 4 +- .../osx_arm64_python3.9.____cpython.yaml | 4 +- ...in_64_numpy1.18python3.6.____cpython.yaml} | 4 +- ...in_64_numpy1.18python3.7.____cpython.yaml} | 4 +- ...in_64_numpy1.18python3.8.____cpython.yaml} | 4 +- ...win_64_numpy1.19python3.9.____cpython.yaml | 2 +- README.md | 50 +++++++------------ 23 files changed, 65 insertions(+), 192 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.17python3.6.____cpython.yaml => linux_64_numpy1.18python3.6.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.17python3.7.____cpython.yaml => linux_64_numpy1.18python3.7.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.17python3.8.____cpython.yaml => linux_64_numpy1.18python3.8.____cpython.yaml} (96%) delete mode 100644 .ci_support/migrations/pypy.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.17python3.6.____cpython.yaml => osx_64_numpy1.18python3.6.____cpython.yaml} (96%) rename .ci_support/{osx_64_numpy1.17python3.7.____cpython.yaml => osx_64_numpy1.18python3.7.____cpython.yaml} (96%) rename .ci_support/{osx_64_numpy1.17python3.8.____cpython.yaml => osx_64_numpy1.18python3.8.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.17python3.6.____cpython.yaml => win_64_numpy1.18python3.6.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy1.17python3.7.____cpython.yaml => win_64_numpy1.18python3.7.____cpython.yaml} (94%) rename .ci_support/{win_64_numpy1.17python3.8.____cpython.yaml => win_64_numpy1.18python3.8.____cpython.yaml} (94%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 273dec7..f16402f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,23 +5,19 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.17python3.6.____cpython: - CONFIG: linux_64_numpy1.17python3.6.____cpython + linux_64_numpy1.18python3.6.____cpython: + CONFIG: linux_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.17python3.7.____cpython: - CONFIG: linux_64_numpy1.17python3.7.____cpython + linux_64_numpy1.18python3.7.____cpython: + CONFIG: linux_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.17python3.8.____cpython: - CONFIG: linux_64_numpy1.17python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.6.____73_pypy: - CONFIG: linux_64_numpy1.18python3.6.____73_pypy + linux_64_numpy1.18python3.8.____cpython: + CONFIG: linux_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.19python3.7.____73_pypy: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b876a3c..48b1fad 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,14 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.17python3.6.____cpython: - CONFIG: osx_64_numpy1.17python3.6.____cpython + osx_64_numpy1.18python3.6.____cpython: + CONFIG: osx_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.7.____cpython: - CONFIG: osx_64_numpy1.17python3.7.____cpython + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.8.____cpython: - CONFIG: osx_64_numpy1.17python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.6.____73_pypy: - CONFIG: osx_64_numpy1.18python3.6.____73_pypy + osx_64_numpy1.18python3.8.____cpython: + CONFIG: osx_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.7.____73_pypy: CONFIG: osx_64_numpy1.19python3.7.____73_pypy diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f993336..d6c5f9e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.17python3.6.____cpython: - CONFIG: win_64_numpy1.17python3.6.____cpython + win_64_numpy1.18python3.6.____cpython: + CONFIG: win_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.17python3.7.____cpython: - CONFIG: win_64_numpy1.17python3.7.____cpython + win_64_numpy1.18python3.7.____cpython: + CONFIG: win_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.17python3.8.____cpython: - CONFIG: win_64_numpy1.17python3.8.____cpython + win_64_numpy1.18python3.8.____cpython: + CONFIG: win_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpython: CONFIG: win_64_numpy1.19python3.9.____cpython @@ -95,7 +95,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml deleted file mode 100644 index 8ea8909..0000000 --- a/.ci_support/linux_64_numpy1.18python3.6.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 7.2.0 -python: -- 3.6.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.6.____cpython.yaml index 0c15943..b173389 100644 --- a/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml @@ -17,13 +17,13 @@ docker_image: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.6.* *_cpython target_platform: diff --git a/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml index 78d1a89..f429cb6 100644 --- a/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -17,13 +17,13 @@ docker_image: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.7.* *_cpython target_platform: diff --git a/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml index 70ca1c3..c49e62c 100644 --- a/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -17,13 +17,13 @@ docker_image: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.8.* *_cpython target_platform: diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml index 75ba4dd..f9c9ea7 100644 --- a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.7.* *_73_pypy target_platform: diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index 4aceb9e..684000e 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/migrations/pypy.yaml b/.ci_support/migrations/pypy.yaml deleted file mode 100644 index b5b6624..0000000 --- a/.ci_support/migrations/pypy.yaml +++ /dev/null @@ -1,34 +0,0 @@ -migrator_ts: 1580746218 # The timestamp of when the migration was made -__migrator: - kind: - version - exclude: - - c_compiler - - vc - - cxx_compiler - migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 - bump_number: 1 # Hashes changed for cpython, so it's better to bump build numbers. - # do not use mamba to check if the issued PRs are solvable - check_solvable: false - longterm: True - paused: False - pr_limit: 1 - -python: - - 3.6.* *_cpython # [not (osx and arm64)] - - 3.7.* *_cpython # [not (osx and arm64)] - - 3.8.* *_cpython - - 3.6.* *_73_pypy # [not (win64 or (osx and arm64))] - -numpy: - - 1.16 # [not (osx and arm64)] - - 1.16 # [not (osx and arm64)] - - 1.16 - - 1.18 # [not (win64 or (osx and arm64))] - -python_impl: - - cpython # [not (osx and arm64)] - - cpython # [not (osx and arm64)] - - cpython - - pypy # [not (win64 or (osx and arm64))] diff --git a/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml b/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml deleted file mode 100644 index e440d85..0000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____73_pypy.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 7.2.0 -python: -- 3.6.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml index 650a8cd..96e5b8e 100644 --- a/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml @@ -17,13 +17,13 @@ geos: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.6.* *_cpython target_platform: diff --git a/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index 0141704..3017efd 100644 --- a/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -17,13 +17,13 @@ geos: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.7.* *_cpython target_platform: diff --git a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index f4402ad..f879e18 100644 --- a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -17,13 +17,13 @@ geos: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.8.* *_cpython target_platform: diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml index 946aa0c..c8cf4e8 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.7.* *_73_pypy target_platform: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 8c68c64..a866a53 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index c27c1fb..aa9713f 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.8.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 1b23743..f84ec6b 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.6.____cpython.yaml index ecc2a70..00810da 100644 --- a/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml @@ -9,13 +9,13 @@ cxx_compiler: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.6.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.7.____cpython.yaml index 11bb837..fdf38ce 100644 --- a/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -9,13 +9,13 @@ cxx_compiler: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.7.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml similarity index 94% rename from .ci_support/win_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.8.____cpython.yaml index 1458a3f..e59edbe 100644 --- a/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -9,13 +9,13 @@ cxx_compiler: geos: - 3.9.1 numpy: -- '1.17' +- '1.18' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.8.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml index ad0836d..2efd191 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -15,7 +15,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 7.2.0 +- 8.0.1 python: - 3.9.* *_cpython target_platform: diff --git a/README.md b/README.md index 81bec82..6e3af1e 100644 --- a/README.md +++ b/README.md @@ -31,31 +31,24 @@ Current build status - + - + - + - - - @@ -73,31 +66,24 @@ Current build status - - - - + - + - + @@ -129,24 +115,24 @@ Current build status - + - + - + From e869f17257054f8331bd28573606e7e2976cd67f Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 10:12:47 -0500 Subject: [PATCH 04/12] add pyproj as requirement, python >=3.7 --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4c47b23..bee6222 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - python + - python >=3.7 - pip - setuptools-scm - cython @@ -31,12 +31,13 @@ requirements: - proj - geos run: - - python + - python >=3.7 - {{ pin_compatible('numpy') }} - shapely >=1.5.6 - pyshp >=1.1.4 - six >=1.3.0 - proj + - pyproj - geos # including matplotlib-base even though it's optional upstream - matplotlib-base >=1.5.1 From 8ceef0faf56ec89bc7856ff776ab314e3fda849d Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 17 Sep 2021 15:15:11 +0000 Subject: [PATCH 05/12] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.17.05.51.46 --- .azure-pipelines/azure-pipelines-linux.yml | 20 +--- .azure-pipelines/azure-pipelines-osx.yml | 24 ++--- .azure-pipelines/azure-pipelines-win.yml | 14 +-- ...__cpython.yaml => linux_64_numpy1.18.yaml} | 8 -- ...nux_64_numpy1.18python3.7.____cpython.yaml | 37 -------- ...nux_64_numpy1.18python3.8.____cpython.yaml | 37 -------- ...__cpython.yaml => linux_64_numpy1.19.yaml} | 8 -- ...nux_64_numpy1.19python3.7.____73_pypy.yaml | 37 -------- ...____cpython.yaml => osx_64_numpy1.18.yaml} | 8 -- ...osx_64_numpy1.18python3.6.____cpython.yaml | 35 ------- ...osx_64_numpy1.18python3.8.____cpython.yaml | 35 ------- ...____cpython.yaml => osx_64_numpy1.19.yaml} | 8 -- ...osx_64_numpy1.19python3.7.____73_pypy.yaml | 35 ------- ...on3.8.____cpython.yaml => osx_arm64_.yaml} | 8 -- .../osx_arm64_python3.9.____cpython.yaml | 35 ------- ...____cpython.yaml => win_64_numpy1.18.yaml} | 9 -- ...win_64_numpy1.18python3.7.____cpython.yaml | 25 ----- ...win_64_numpy1.18python3.8.____cpython.yaml | 25 ----- ...____cpython.yaml => win_64_numpy1.19.yaml} | 9 -- README.md | 91 +++---------------- 20 files changed, 28 insertions(+), 480 deletions(-) rename .ci_support/{linux_64_numpy1.18python3.6.____cpython.yaml => linux_64_numpy1.18.yaml} (78%) delete mode 100644 .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{linux_64_numpy1.19python3.9.____cpython.yaml => linux_64_numpy1.19.yaml} (78%) delete mode 100644 .ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.18python3.7.____cpython.yaml => osx_64_numpy1.18.yaml} (77%) delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{osx_64_numpy1.19python3.9.____cpython.yaml => osx_64_numpy1.19.yaml} (77%) delete mode 100644 .ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_.yaml} (77%) delete mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml rename .ci_support/{win_64_numpy1.18python3.6.____cpython.yaml => win_64_numpy1.18.yaml} (61%) delete mode 100644 .ci_support/win_64_numpy1.18python3.7.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{win_64_numpy1.19python3.9.____cpython.yaml => win_64_numpy1.19.yaml} (61%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f16402f..8c34c9d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.6.____cpython: - CONFIG: linux_64_numpy1.18python3.6.____cpython + linux_64_numpy1.18: + CONFIG: linux_64_numpy1.18 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.7.____cpython: - CONFIG: linux_64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.8.____cpython: - CONFIG: linux_64_numpy1.18python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.19python3.7.____73_pypy: - CONFIG: linux_64_numpy1.19python3.7.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.19python3.9.____cpython: - CONFIG: linux_64_numpy1.19python3.9.____cpython + linux_64_numpy1.19: + CONFIG: linux_64_numpy1.19 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 48b1fad..3037fa1 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,26 +8,14 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.6.____cpython: - CONFIG: osx_64_numpy1.18python3.6.____cpython + osx_64_numpy1.18: + CONFIG: osx_64_numpy1.18 UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.7.____cpython: - CONFIG: osx_64_numpy1.18python3.7.____cpython + osx_64_numpy1.19: + CONFIG: osx_64_numpy1.19 UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.8.____cpython: - CONFIG: osx_64_numpy1.18python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.7.____73_pypy: - CONFIG: osx_64_numpy1.19python3.7.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.9.____cpython: - CONFIG: osx_64_numpy1.19python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d6c5f9e..ab4f725 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,11 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.18python3.6.____cpython: - CONFIG: win_64_numpy1.18python3.6.____cpython + win_64_numpy1.18: + CONFIG: win_64_numpy1.18 UPLOAD_PACKAGES: 'True' - win_64_numpy1.18python3.7.____cpython: - CONFIG: win_64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.18python3.8.____cpython: - CONFIG: win_64_numpy1.18python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.19python3.9.____cpython: - CONFIG: win_64_numpy1.19python3.9.____cpython + win_64_numpy1.19: + CONFIG: win_64_numpy1.19 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.18python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.18.yaml index b173389..5043726 100644 --- a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18.yaml @@ -18,14 +18,8 @@ geos: - 3.9.1 numpy: - '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.6.* *_cpython target_platform: - linux-64 zip_keys: @@ -33,5 +27,3 @@ zip_keys: - cxx_compiler_version - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml deleted file mode 100644 index f429cb6..0000000 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.7.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml deleted file mode 100644 index c49e62c..0000000 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -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.19.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.19.yaml index 684000e..445d68c 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19.yaml @@ -18,14 +18,8 @@ geos: - 3.9.1 numpy: - '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.9.* *_cpython target_platform: - linux-64 zip_keys: @@ -33,5 +27,3 @@ zip_keys: - cxx_compiler_version - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml deleted file mode 100644 index f9c9ea7..0000000 --- a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -geos: -- 3.9.1 -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.7.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18.yaml index 3017efd..e81f06c 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18.yaml @@ -18,18 +18,10 @@ macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.7.* *_cpython target_platform: - osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 96e5b8e..0000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.6.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml deleted file mode 100644 index f879e18..0000000 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.19.yaml index a866a53..e52c822 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19.yaml @@ -18,18 +18,10 @@ macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.9.* *_cpython target_platform: - osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml deleted file mode 100644 index c8cf4e8..0000000 --- a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.7.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_.yaml similarity index 77% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_.yaml index aa9713f..ef983b1 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -18,18 +18,10 @@ macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.8.* *_cpython target_platform: - osx-arm64 zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml deleted file mode 100644 index f84ec6b..0000000 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.9.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18.yaml similarity index 61% rename from .ci_support/win_64_numpy1.18python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.18.yaml index 00810da..77e1436 100644 --- a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18.yaml @@ -10,16 +10,7 @@ geos: - 3.9.1 numpy: - '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.6.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml deleted file mode 100644 index fdf38ce..0000000 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.7.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml deleted file mode 100644 index e59edbe..0000000 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19.yaml similarity index 61% rename from .ci_support/win_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.19.yaml index 2efd191..aad387f 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19.yaml @@ -10,16 +10,7 @@ geos: - 3.9.1 numpy: - '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x proj: - 8.0.1 -python: -- 3.9.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - numpy diff --git a/README.md b/README.md index 6e3af1e..d2220f2 100644 --- a/README.md +++ b/README.md @@ -31,115 +31,52 @@ Current build status
VariantStatus
linux_64_numpy1.17python3.6.____cpythonlinux_64_numpy1.18python3.6.____cpython - variant + variant
linux_64_numpy1.17python3.7.____cpythonlinux_64_numpy1.18python3.7.____cpython - variant + variant
linux_64_numpy1.17python3.8.____cpythonlinux_64_numpy1.18python3.8.____cpython - variant - -
linux_64_numpy1.18python3.6.____73_pypy - - variant + variant
osx_64_numpy1.17python3.6.____cpython - - variant - -
osx_64_numpy1.17python3.7.____cpythonosx_64_numpy1.18python3.6.____cpython - variant + variant
osx_64_numpy1.17python3.8.____cpythonosx_64_numpy1.18python3.7.____cpython - variant + variant
osx_64_numpy1.18python3.6.____73_pypyosx_64_numpy1.18python3.8.____cpython - variant + variant
win_64_numpy1.17python3.6.____cpythonwin_64_numpy1.18python3.6.____cpython - variant + variant
win_64_numpy1.17python3.7.____cpythonwin_64_numpy1.18python3.7.____cpython - variant + variant
win_64_numpy1.17python3.8.____cpythonwin_64_numpy1.18python3.8.____cpython - variant + variant
- + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - From 397430affbfe5e31eb9a01e993fe47fdda4bfbc2 Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 10:22:25 -0500 Subject: [PATCH 06/12] remove python requirement on host --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bee6222..837bfe3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - python >=3.7 + - python - pip - setuptools-scm - cython From 5183a671038be2d784167637e4afda3e71126daf Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 10:34:41 -0500 Subject: [PATCH 07/12] adjust requirements per release notes --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 837bfe3..239d22e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,16 +31,16 @@ requirements: - proj - geos run: - - python >=3.7 + - python - {{ pin_compatible('numpy') }} - - shapely >=1.5.6 - - pyshp >=1.1.4 + - shapely >=1.6.4 + - pyshp >=2.1 - six >=1.3.0 - - proj - - pyproj - - geos + - proj >=8.0 + - pyproj >=3.0 + - geos >=3.7.2 # including matplotlib-base even though it's optional upstream - - matplotlib-base >=1.5.1 + - matplotlib-base >=3.1 - scipy >=0.10 - ucrt # [win] From 85cdf2f5283dbb6f65c829a87491f310a0f46ca0 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 17 Sep 2021 15:38:08 +0000 Subject: [PATCH 08/12] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.17.05.51.46 --- .azure-pipelines/azure-pipelines-linux.yml | 20 +++- .azure-pipelines/azure-pipelines-osx.yml | 24 +++-- .azure-pipelines/azure-pipelines-win.yml | 14 ++- ...ux_64_numpy1.18python3.6.____cpython.yaml} | 8 ++ ...nux_64_numpy1.18python3.7.____cpython.yaml | 37 ++++++++ ...nux_64_numpy1.18python3.8.____cpython.yaml | 37 ++++++++ ...ux_64_numpy1.19python3.7.____73_pypy.yaml} | 8 ++ ...nux_64_numpy1.19python3.9.____cpython.yaml | 37 ++++++++ ...sx_64_numpy1.18python3.6.____cpython.yaml} | 8 ++ ...osx_64_numpy1.18python3.7.____cpython.yaml | 35 +++++++ ...osx_64_numpy1.18python3.8.____cpython.yaml | 35 +++++++ ...sx_64_numpy1.19python3.7.____73_pypy.yaml} | 8 ++ ...osx_64_numpy1.19python3.9.____cpython.yaml | 35 +++++++ ...l => osx_arm64_python3.8.____cpython.yaml} | 8 ++ .../osx_arm64_python3.9.____cpython.yaml | 35 +++++++ ...in_64_numpy1.18python3.6.____cpython.yaml} | 9 ++ ...win_64_numpy1.18python3.7.____cpython.yaml | 25 +++++ ...win_64_numpy1.18python3.8.____cpython.yaml | 25 +++++ ...in_64_numpy1.19python3.9.____cpython.yaml} | 9 ++ README.md | 91 ++++++++++++++++--- 20 files changed, 480 insertions(+), 28 deletions(-) rename .ci_support/{linux_64_numpy1.18.yaml => linux_64_numpy1.18python3.6.____cpython.yaml} (78%) create mode 100644 .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml create mode 100644 .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{linux_64_numpy1.19.yaml => linux_64_numpy1.19python3.7.____73_pypy.yaml} (78%) create mode 100644 .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename .ci_support/{osx_64_numpy1.18.yaml => osx_64_numpy1.18python3.6.____cpython.yaml} (77%) create mode 100644 .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{osx_64_numpy1.19.yaml => osx_64_numpy1.19python3.7.____73_pypy.yaml} (77%) create mode 100644 .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_python3.8.____cpython.yaml} (77%) create mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml rename .ci_support/{win_64_numpy1.18.yaml => win_64_numpy1.18python3.6.____cpython.yaml} (61%) create mode 100644 .ci_support/win_64_numpy1.18python3.7.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.18python3.8.____cpython.yaml rename .ci_support/{win_64_numpy1.19.yaml => win_64_numpy1.19python3.9.____cpython.yaml} (61%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8c34c9d..f16402f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,24 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18: - CONFIG: linux_64_numpy1.18 + linux_64_numpy1.18python3.6.____cpython: + CONFIG: linux_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.19: - CONFIG: linux_64_numpy1.19 + linux_64_numpy1.18python3.7.____cpython: + CONFIG: linux_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.18python3.8.____cpython: + CONFIG: linux_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_numpy1.19python3.7.____73_pypy: + CONFIG: linux_64_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: 'True' + 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: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3037fa1..48b1fad 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,14 +8,26 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18: - CONFIG: osx_64_numpy1.18 + osx_64_numpy1.18python3.6.____cpython: + CONFIG: osx_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19: - CONFIG: osx_64_numpy1.19 + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_numpy1.18python3.8.____cpython: + CONFIG: osx_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.7.____73_pypy: + CONFIG: osx_64_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.9.____cpython: + CONFIG: osx_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ab4f725..d6c5f9e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,17 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.18: - CONFIG: win_64_numpy1.18 + win_64_numpy1.18python3.6.____cpython: + CONFIG: win_64_numpy1.18python3.6.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.19: - CONFIG: win_64_numpy1.19 + win_64_numpy1.18python3.7.____cpython: + CONFIG: win_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.18python3.8.____cpython: + CONFIG: win_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____cpython: + CONFIG: win_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.18.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.18.yaml rename to .ci_support/linux_64_numpy1.18python3.6.____cpython.yaml index 5043726..b173389 100644 --- a/.ci_support/linux_64_numpy1.18.yaml +++ b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml @@ -18,8 +18,14 @@ geos: - 3.9.1 numpy: - '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.6.* *_cpython target_platform: - linux-64 zip_keys: @@ -27,3 +33,5 @@ zip_keys: - cxx_compiler_version - - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml new file mode 100644 index 0000000..f429cb6 --- /dev/null +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -0,0 +1,37 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +geos: +- 3.9.1 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.7.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml new file mode 100644 index 0000000..c49e62c --- /dev/null +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -0,0 +1,37 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +geos: +- 3.9.1 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.8.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.19.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.19.yaml rename to .ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml index 445d68c..f9c9ea7 100644 --- a/.ci_support/linux_64_numpy1.19.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml @@ -18,8 +18,14 @@ geos: - 3.9.1 numpy: - '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.7.* *_73_pypy target_platform: - linux-64 zip_keys: @@ -27,3 +33,5 @@ zip_keys: - 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 new file mode 100644 index 0000000..684000e --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,37 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +geos: +- 3.9.1 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.18.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.18.yaml rename to .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml index e81f06c..96e5b8e 100644 --- a/.ci_support/osx_64_numpy1.18.yaml +++ b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml @@ -18,10 +18,18 @@ macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.6.* *_cpython target_platform: - osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml new file mode 100644 index 0000000..3017efd --- /dev/null +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +geos: +- 3.9.1 +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.7.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml new file mode 100644 index 0000000..f879e18 --- /dev/null +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +geos: +- 3.9.1 +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.8.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.19.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml similarity index 77% rename from .ci_support/osx_64_numpy1.19.yaml rename to .ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml index e52c822..c8cf4e8 100644 --- a/.ci_support/osx_64_numpy1.19.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml @@ -18,10 +18,18 @@ macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.7.* *_73_pypy target_platform: - osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml new file mode 100644 index 0000000..a866a53 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +geos: +- 3.9.1 +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.9.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml similarity index 77% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_python3.8.____cpython.yaml index ef983b1..aa9713f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -18,10 +18,18 @@ macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.8.* *_cpython target_platform: - osx-arm64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml new file mode 100644 index 0000000..f84ec6b --- /dev/null +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +geos: +- 3.9.1 +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.9.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.18.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml similarity index 61% rename from .ci_support/win_64_numpy1.18.yaml rename to .ci_support/win_64_numpy1.18python3.6.____cpython.yaml index 77e1436..00810da 100644 --- a/.ci_support/win_64_numpy1.18.yaml +++ b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml @@ -10,7 +10,16 @@ geos: - 3.9.1 numpy: - '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.6.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml new file mode 100644 index 0000000..fdf38ce --- /dev/null +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +geos: +- 3.9.1 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.7.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml new file mode 100644 index 0000000..e59edbe --- /dev/null +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +geos: +- 3.9.1 +numpy: +- '1.18' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 8.0.1 +python: +- 3.8.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.19.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml similarity index 61% rename from .ci_support/win_64_numpy1.19.yaml rename to .ci_support/win_64_numpy1.19python3.9.____cpython.yaml index aad387f..2efd191 100644 --- a/.ci_support/win_64_numpy1.19.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -10,7 +10,16 @@ geos: - 3.9.1 numpy: - '1.19' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x proj: - 8.0.1 +python: +- 3.9.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index d2220f2..6e3af1e 100644 --- a/README.md +++ b/README.md @@ -31,52 +31,115 @@ Current build status
VariantStatus
linux_64_numpy1.18python3.6.____cpythonlinux_64_numpy1.18 - variant + variant
linux_64_numpy1.18python3.7.____cpythonlinux_64_numpy1.19 - variant + variant
linux_64_numpy1.18python3.8.____cpythonosx_64_numpy1.18 - variant + variant
linux_64_numpy1.19python3.7.____73_pypyosx_64_numpy1.19 - variant + variant
linux_64_numpy1.19python3.9.____cpythonosx_arm64 - variant + variant
osx_64_numpy1.18python3.6.____cpythonwin_64_numpy1.18 - variant + variant
osx_64_numpy1.18python3.7.____cpythonwin_64_numpy1.19 - variant - -
osx_64_numpy1.18python3.8.____cpython - - variant - -
osx_64_numpy1.19python3.7.____73_pypy - - variant - -
osx_64_numpy1.19python3.9.____cpython - - variant - -
osx_arm64_python3.8.____cpython - - variant - -
osx_arm64_python3.9.____cpython - - variant - -
win_64_numpy1.18python3.6.____cpython - - variant - -
win_64_numpy1.18python3.7.____cpython - - variant - -
win_64_numpy1.18python3.8.____cpython - - variant - -
win_64_numpy1.19python3.9.____cpython - - variant + variant
- + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a9a084e5a012a1e0f375c178372faf9c33ab2743 Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 10:41:40 -0500 Subject: [PATCH 09/12] adjust requirements per review --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 239d22e..a6bbc96 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,9 +36,9 @@ requirements: - shapely >=1.6.4 - pyshp >=2.1 - six >=1.3.0 - - proj >=8.0 + - proj - pyproj >=3.0 - - geos >=3.7.2 + - geos # including matplotlib-base even though it's optional upstream - matplotlib-base >=3.1 - scipy >=0.10 From ac560b70367921fd1e7336665976e5075667b862 Mon Sep 17 00:00:00 2001 From: daryl herzmann Date: Fri, 17 Sep 2021 10:46:05 -0500 Subject: [PATCH 10/12] Update recipe/meta.yaml Co-authored-by: Xylar Asay-Davis --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a6bbc96..80464c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,8 @@ source: build: error_overlinking: true number: 0 + # compatible proj and pyproj are only available for py>=37 + skip: true # [py<37] requirements: build: From 3ce6632bf5f0ac12674f46b50826c14ba431a04d Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Fri, 17 Sep 2021 15:48:24 +0000 Subject: [PATCH 11/12] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.17.05.51.46 --- .azure-pipelines/azure-pipelines-linux.yml | 4 -- .azure-pipelines/azure-pipelines-osx.yml | 3 -- .azure-pipelines/azure-pipelines-win.yml | 3 -- ...nux_64_numpy1.18python3.6.____cpython.yaml | 37 ------------------- ...osx_64_numpy1.18python3.6.____cpython.yaml | 35 ------------------ ...win_64_numpy1.18python3.6.____cpython.yaml | 25 ------------- README.md | 21 ----------- 7 files changed, 128 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.18python3.6.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f16402f..f281904 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.6.____cpython: - CONFIG: linux_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.18python3.7.____cpython: CONFIG: linux_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 48b1fad..f2d582d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.6.____cpython: - CONFIG: osx_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.7.____cpython: CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d6c5f9e..5fd91a5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,9 +8,6 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.18python3.6.____cpython: - CONFIG: win_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.18python3.7.____cpython: CONFIG: win_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index b173389..0000000 --- a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 96e5b8e..0000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -geos: -- 3.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.6.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 00810da..0000000 --- a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -geos: -- 3.9.1 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 8.0.1 -python: -- 3.6.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/README.md b/README.md index 6e3af1e..e64bcd2 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,6 @@ Current build status
VariantStatus
linux_64_numpy1.18linux_64_numpy1.18python3.6.____cpython - variant + variant
linux_64_numpy1.19linux_64_numpy1.18python3.7.____cpython - variant + variant
osx_64_numpy1.18linux_64_numpy1.18python3.8.____cpython - variant + variant
osx_64_numpy1.19linux_64_numpy1.19python3.7.____73_pypy - variant + variant
osx_arm64linux_64_numpy1.19python3.9.____cpython - variant + variant
win_64_numpy1.18osx_64_numpy1.18python3.6.____cpython - variant + variant
win_64_numpy1.19osx_64_numpy1.18python3.7.____cpython - variant + variant + +
osx_64_numpy1.18python3.8.____cpython + + variant + +
osx_64_numpy1.19python3.7.____73_pypy + + variant + +
osx_64_numpy1.19python3.9.____cpython + + variant + +
osx_arm64_python3.8.____cpython + + variant + +
osx_arm64_python3.9.____cpython + + variant + +
win_64_numpy1.18python3.6.____cpython + + variant + +
win_64_numpy1.18python3.7.____cpython + + variant + +
win_64_numpy1.18python3.8.____cpython + + variant + +
win_64_numpy1.19python3.9.____cpython + + variant
- - - - - - - - -
VariantStatus
linux_64_numpy1.18python3.6.____cpython - - variant - -
linux_64_numpy1.18python3.7.____cpython @@ -65,13 +58,6 @@ Current build status variant
osx_64_numpy1.18python3.6.____cpython - - variant - -
osx_64_numpy1.18python3.7.____cpython @@ -114,13 +100,6 @@ Current build status variant
win_64_numpy1.18python3.6.____cpython - - variant - -
win_64_numpy1.18python3.7.____cpython From e37c7ffc80de3962685b6aa89bd050b3ada241eb Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 17 Sep 2021 14:31:38 -0500 Subject: [PATCH 12/12] add akrherz as maintainer --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 80464c5..a2b365f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -71,3 +71,4 @@ extra: - pelson - dopplershift - xylar + - akrherz