Merge branch 'master' of https://github.com/EconForge/interpolation.py

Author: albop

interpolation/compat.py

@@ -1,16 +1,15 @@
-
 from distutils.version import LooseVersion
 
-
 from numba import __version__
 
 if LooseVersion(__version__)>='0.43':
     overload_options = {'strict': False}
 else:
     overload_options = {}
 
-from numba.core.types import Tuple, UniTuple
-# if LooseVersion(__version__)>='0.49':
-#     from numba.core.types import Tuple, UniTuple
-# else:
-#     from numba.core.types.containers import Tuple, UniTuple
+if LooseVersion(__version__)>='0.49':
+    from numba.core.types import Array, Float, Integer
+    from numba.core.types import Tuple, UniTuple
+else:
+    from numba.types import Array, Float, Integer
+    from numba.types.containers import Tuple, UniTuple

interpolation/multilinear/fungen.py

@@ -5,9 +5,8 @@
 import ast
 
 from numba.extending import overload
-from numba.core.types import Array
+from ..compat import Array, Tuple, UniTuple
 from ..compat import overload_options
-from ..compat import Tuple, UniTuple
 
 
 # from math import max, min

interpolation/multilinear/mlinterp.py

@@ -23,8 +23,8 @@
 from numba import njit
 from typing import Tuple
 
-from ..compat import UniTuple, Tuple
-from numba.core.types import Float, Integer, Array
+from ..compat import UniTuple, Tuple, Float, Integer, Array
+
 Scalar = (Float, Integer)
 
 import numpy as np

interpolation/splines/eval_splines.py

@@ -78,7 +78,7 @@
 import numpy as np
 from numba import njit
 from numba.extending import overload
-from numba.core.types import Array
+from ..compat import Array
 
 def _eval_linear():
     pass

pyproject.toml

@@ -14,10 +14,10 @@ license = "BSD-2-Clause"
 
 [tool.poetry.dependencies]
 python = "^3.6"
-numba = ">= 0.49"
-numpy = "^1.18.3"
-tempita = "^0.5.2"
-scipy = "^1.4.1"
+numba = ">=0.47"
+numpy = ">=1.18.1"
+tempita = ">=0.5.2"
+scipy = ">=1.4.1"
 
 [tool.poetry.dev-dependencies]
 pytest = "^5.2"