Skip to content

backport natural earth download URL #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xylar merged 2 commits into from
Sep 3, 2021
Merged

backport natural earth download URL #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f31894e
backport natural earth download URL
akrherz Sep 3, 2021
caa709a
add ucrt [win] to runtime requirements
akrherz Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions recipe/gh1833_update_ne_url.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
5 changes: 4 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down