Merge pull request #116 from akrherz/patch_downloader

backport natural earth download URL
conda-forge · Sep 3, 2021 · 5468ec5 · 5468ec5 · conda-forge-linter · Sep 3, 2021
2 parents 273dff1 + caa709a
commit 5468ec5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/recipe/gh1833_update_ne_url.patch 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
@@ -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:
@@ -41,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: