diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 273dec7..f281904 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,23 +5,15 @@ 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.7.____cpython: + CONFIG: linux_64_numpy1.18python3.7.____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 - 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..f2d582d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,11 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.17python3.6.____cpython: - CONFIG: osx_64_numpy1.17python3.6.____cpython + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.7.____cpython: - CONFIG: osx_64_numpy1.17python3.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..5fd91a5 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,11 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.17python3.6.____cpython: - CONFIG: win_64_numpy1.17python3.6.____cpython + win_64_numpy1.18python3.7.____cpython: + CONFIG: win_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.17python3.7.____cpython: - CONFIG: win_64_numpy1.17python3.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 +92,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.17python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml deleted file mode 100644 index 0c15943..0000000 --- a/.ci_support/linux_64_numpy1.17python3.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.17' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 7.2.0 -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/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.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.17python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml deleted file mode 100644 index 650a8cd..0000000 --- a/.ci_support/osx_64_numpy1.17python3.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.17' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 7.2.0 -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.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.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.17python3.6.____cpython.yaml deleted file mode 100644 index ecc2a70..0000000 --- a/.ci_support/win_64_numpy1.17python3.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.17' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 7.2.0 -python: -- 3.6.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy 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..e64bcd2 100644 --- a/README.md +++ b/README.md @@ -31,31 +31,17 @@ Current build status - + - + - - - - - - @@ -73,31 +59,17 @@ Current build status - + - + - - - - - - @@ -129,24 +101,17 @@ Current build status - - - - + - + 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..a2b365f 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,13 +6,13 @@ package: source: url: https://pypi.io/packages/source/C/Cartopy/Cartopy-{{ version }}.tar.gz - sha256: 4b8b4773a98ed7009fe17d9b6ec87ac3ac62b7d14634d7768c190eadc647d576 - patches: - - gh1833_update_ne_url.patch + sha256: eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a build: error_overlinking: true - number: 1 + number: 0 + # compatible proj and pyproj are only available for py>=37 + skip: true # [py<37] requirements: build: @@ -35,13 +35,14 @@ requirements: run: - 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 >=3.0 - geos # including matplotlib-base even though it's optional upstream - - matplotlib-base >=1.5.1 + - matplotlib-base >=3.1 - scipy >=0.10 - ucrt # [win] @@ -70,3 +71,4 @@ extra: - pelson - dopplershift - xylar + - akrherz
VariantStatus
linux_64_numpy1.17python3.6.____cpythonlinux_64_numpy1.18python3.7.____cpython - variant + variant
linux_64_numpy1.17python3.7.____cpythonlinux_64_numpy1.18python3.8.____cpython - variant - -
linux_64_numpy1.17python3.8.____cpython - - variant - -
linux_64_numpy1.18python3.6.____73_pypy - - variant + variant
osx_64_numpy1.17python3.6.____cpythonosx_64_numpy1.18python3.7.____cpython - variant + variant
osx_64_numpy1.17python3.7.____cpythonosx_64_numpy1.18python3.8.____cpython - variant - -
osx_64_numpy1.17python3.8.____cpython - - variant - -
osx_64_numpy1.18python3.6.____73_pypy - - variant + variant
win_64_numpy1.17python3.6.____cpython - - 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