From f31894eb4f3597a69f1be8194fa6024551512a17 Mon Sep 17 00:00:00 2001 From: akrherz Date: Thu, 2 Sep 2021 21:48:20 -0500 Subject: [PATCH 1/2] backport natural earth download URL --- recipe/gh1833_update_ne_url.patch | 15 +++++++++++++++ recipe/meta.yaml | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipe/gh1833_update_ne_url.patch diff --git a/recipe/gh1833_update_ne_url.patch b/recipe/gh1833_update_ne_url.patch new file mode 100644 index 0000000..5a4fd26 --- /dev/null +++ b/recipe/gh1833_update_ne_url.patch @@ -0,0 +1,15 @@ +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 cdd5f0f..98077c7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,10 +7,12 @@ 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 - number: 0 + number: 1 requirements: build: From caa709a39ae4d191cc87006b0c7da47543ee8cf4 Mon Sep 17 00:00:00 2001 From: akrherz Date: Fri, 3 Sep 2021 09:06:29 -0500 Subject: [PATCH 2/2] add ucrt [win] to runtime requirements --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 98077c7..a019583 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,6 +43,7 @@ requirements: # including matplotlib-base even though it's optional upstream - matplotlib-base >=1.5.1 - scipy >=0.10 + - ucrt # [win] test: imports: