forked from conda-forge/cdms2-feedstock
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0013-esmpy-imports.patch
68 lines (66 loc) · 2.3 KB
/
0013-esmpy-imports.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
diff -ruN cdms-3.1.5/regrid2/Lib/esmf.py cdms-3.1.5-patch/regrid2/Lib/esmf.py
--- cdms-3.1.5/regrid2/Lib/esmf.py 2020-07-31 03:01:33.000000000 +0200
+++ cdms-3.1.5-patch/regrid2/Lib/esmf.py 2023-08-01 09:02:26.554853011 +0200
@@ -15,7 +15,10 @@
import time
import numpy
from regrid2 import RegridError
-import ESMF
+try:
+ import esmpy as ESMF
+except ImportError:
+ import ESMF
from functools import reduce
# constants
diff -ruN cdms-3.1.5/regrid2/Lib/__init__.py cdms-3.1.5-patch/regrid2/Lib/__init__.py
--- cdms-3.1.5/regrid2/Lib/__init__.py 2020-07-31 03:01:33.000000000 +0200
+++ cdms-3.1.5-patch/regrid2/Lib/__init__.py 2023-08-01 09:01:50.815080096 +0200
@@ -14,7 +14,10 @@
from .mvGenericRegrid import GenericRegrid # noqa
from .mvLibCFRegrid import LibCFRegrid # noqa
try:
- import ESMF
+ try:
+ import esmpy as ESMF
+ except ImportError:
+ import ESMF
ESMF.deprecated.__globals__[
'warnings'].warn_explicit = ESMF.deprecated.__globals__['warnings'].formatwarning
from .mvESMFRegrid import ESMFRegrid # noqa
@@ -24,7 +27,10 @@
ESMF_HAS_BEEN_INITIALIZED = False
if not ESMF_HAS_BEEN_INITIALIZED:
try:
- import ESMF
+ try:
+ import esmpy as ESMF
+ except ImportError:
+ import ESMF
ESMF.deprecated.__globals__[
'warnings'].warn_explicit = ESMF.deprecated.__globals__['warnings'].formatwarning
ESMF.Manager(debug=False)
diff -ruN cdms-3.1.5/regrid2/Lib/mvESMFRegrid.py cdms-3.1.5-patch/regrid2/Lib/mvESMFRegrid.py
--- cdms-3.1.5/regrid2/Lib/mvESMFRegrid.py 2020-07-31 03:01:33.000000000 +0200
+++ cdms-3.1.5-patch/regrid2/Lib/mvESMFRegrid.py 2023-08-01 09:02:26.538853112 +0200
@@ -12,7 +12,10 @@
import socket
import numpy
-import ESMF
+try:
+ import esmpy as ESMF
+except ImportError:
+ import ESMF
from . import esmf
from . import RegridError
from .mvGenericRegrid import GenericRegrid
diff -ruN cdms-3.1.5/regrid2/Lib/mytest.py cdms-3.1.5-patch/regrid2/Lib/mytest.py
--- cdms-3.1.5/regrid2/Lib/mytest.py 2020-07-31 03:01:33.000000000 +0200
+++ cdms-3.1.5-patch/regrid2/Lib/mytest.py 2023-08-01 09:04:07.634210699 +0200
@@ -1,2 +1,6 @@
-import ESMF # noqa
+try:
+ import esmpy as ESMF # noqa
+except ImportError:
+ import ESMF # noqa
+
from .mvESMFRegrid import ESMFRegrid # noqa