From 1e2d5d0f45e415441f7c26c6955e2aa1808c6b43 Mon Sep 17 00:00:00 2001 From: "stephen.worsley" Date: Wed, 6 Nov 2024 16:54:07 +0000 Subject: [PATCH 1/4] fix for older iris versions --- esmf_regrid/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmf_regrid/__init__.py b/esmf_regrid/__init__.py index 9c6070d6..2472b508 100644 --- a/esmf_regrid/__init__.py +++ b/esmf_regrid/__init__.py @@ -16,7 +16,7 @@ raise exc if hasattr(_imesh, "PARSE_UGRID_ON_LOAD"): - _load_context = _imesh.PARSE_UGRID_ON_LOAD + _load_context = _imesh.PARSE_UGRID_ON_LOAD.context else: from contextlib import nullcontext From b5edcd79023e21d067e43ddb343ee4523b06e960 Mon Sep 17 00:00:00 2001 From: "stephen.worsley" Date: Thu, 7 Nov 2024 09:00:50 +0000 Subject: [PATCH 2/4] fix for readthedocs --- docs/src/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/conf.py b/docs/src/conf.py index 22ed0955..77df2902 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -26,6 +26,7 @@ os.environ["ESMFMKFILE"] = f"{rtd_conda_prefix}/lib/esmf.mk" os.environ["PROJ_DATA"] = f"{rtd_conda_prefix}/share/proj" os.environ["PROJ_NETWORK"] = "OFF" + os.environ["LC_ALL"] = "C" # -- Project information ----------------------------------------------------- From 58763b611208d67b5570605398755287d81315e1 Mon Sep 17 00:00:00 2001 From: "stephen.worsley" Date: Thu, 7 Nov 2024 10:07:07 +0000 Subject: [PATCH 3/4] fix for readthedocs --- docs/src/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/conf.py b/docs/src/conf.py index 77df2902..0df6b36a 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -6,6 +6,7 @@ from datetime import datetime import os +import locale from pathlib import Path import re import sys @@ -26,7 +27,7 @@ os.environ["ESMFMKFILE"] = f"{rtd_conda_prefix}/lib/esmf.mk" os.environ["PROJ_DATA"] = f"{rtd_conda_prefix}/share/proj" os.environ["PROJ_NETWORK"] = "OFF" - os.environ["LC_ALL"] = "C" + locale.setlocale(locale.LC_NUMERIC, "C") # -- Project information ----------------------------------------------------- From 795c09d744201b6a002e5161a32f62a0f3b3a87d Mon Sep 17 00:00:00 2001 From: "stephen.worsley" Date: Thu, 7 Nov 2024 10:19:02 +0000 Subject: [PATCH 4/4] flake8 --- docs/src/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/conf.py b/docs/src/conf.py index 0df6b36a..2534f9b5 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -5,8 +5,8 @@ """ from datetime import datetime -import os import locale +import os from pathlib import Path import re import sys