From 2254e63f0ccedb9ea6a11ef621cd16010fb1325b Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 4 Jan 2023 21:07:07 +0100
Subject: [PATCH 1/2] Fix importlib.resources imports for python 3.8

---
 conda_package/mpas_tools/config.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/conda_package/mpas_tools/config.py b/conda_package/mpas_tools/config.py
index 59b03ae9d..af2fe8000 100644
--- a/conda_package/mpas_tools/config.py
+++ b/conda_package/mpas_tools/config.py
@@ -1,11 +1,15 @@
 from configparser import RawConfigParser, ConfigParser, ExtendedInterpolation
 import os
-from importlib import resources
 import inspect
 import sys
 import numpy as np
 import ast
 from io import StringIO
+try:
+    from importlib.resources import files as imp_res_files
+except ImportError:
+    # python<=3.8
+    from importlib_resources import files as imp_res_files
 
 
 class MpasConfigParser:
@@ -83,8 +87,8 @@ def add_from_package(self, package, config_filename, exception=True):
             Whether to raise an exception if the config file isn't found
         """
         try:
-            with resources.path(package, config_filename) as path:
-                self._add(path, user=False)
+            path = imp_res_files(package) / config_filename
+            self._add(path, user=False)
         except (ModuleNotFoundError, FileNotFoundError, TypeError):
             if exception:
                 raise

From 5c1241c1f6c8a5640882b48cafbb55122a727478 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 4 Jan 2023 21:08:00 +0100
Subject: [PATCH 2/2] Update dependencies

Require importlib_resources for py38

Update required geometric_features
---
 conda_package/dev-spec.txt     | 3 ++-
 conda_package/recipe/meta.yaml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conda_package/dev-spec.txt b/conda_package/dev-spec.txt
index 9417d4c9d..2a4dc006e 100644
--- a/conda_package/dev-spec.txt
+++ b/conda_package/dev-spec.txt
@@ -5,8 +5,9 @@
 python>=3.8
 cartopy
 dask
-geometric_features>=1.0.0,<2.0.0
+geometric_features>=1.0.1,<2.0.0
 hdf5
+importlib_resources
 inpoly
 jigsaw>=0.9.12
 jigsawpy>=0.2.1
diff --git a/conda_package/recipe/meta.yaml b/conda_package/recipe/meta.yaml
index f2907fdb5..554318aa4 100644
--- a/conda_package/recipe/meta.yaml
+++ b/conda_package/recipe/meta.yaml
@@ -54,8 +54,9 @@ requirements:
     - python
     - cartopy
     - dask
-    - geometric_features >=1.0.0,<2.0.0
+    - geometric_features >=1.0.1,<2.0.0
     - hdf5
+    - importlib_resources  # [py<=38]
     - inpoly
     - jigsaw >=0.9.12
     - jigsawpy >=0.2.1