From 94980d70f1afa792b215bbafd18bb929ca22fe77 Mon Sep 17 00:00:00 2001 From: Chris Alfonso Date: Thu, 3 Aug 2023 17:27:08 +1000 Subject: [PATCH] Add pykdtree dependency If pykdtree is present, cartopy uses it instead of scipy's implementation, avoiding a potential incompatibility with scipy>=1.11.0. --- conda/meta.yaml | 3 ++- setup.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 49644abc..55c740c7 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,6 +32,7 @@ requirements: - rasterio - geopandas - stripy + - pykdtree test: imports: @@ -52,4 +53,4 @@ about: extra: recipe-maintainers: - brmather - - jcannon-gplates \ No newline at end of file + - jcannon-gplates diff --git a/setup.py b/setup.py index 5d29ecf9..d087a25f 100644 --- a/setup.py +++ b/setup.py @@ -93,6 +93,7 @@ def _minimal_ext_cmd(cmd): 'rasterio', 'geopandas', 'stripy', + 'pykdtree', ], packages = ['gplately'], package_data = {'gplately': ['Notebooks/*ipynb', # Worked Examples is not currently used