Merge pull request #81 from scipp/dependabot/pip/requirements/scipp-2…

…2.11.0 Bump scipp from 0.17.0 to 22.11.0 in /requirements
scipp · Nov 28, 2022 · 966e8cc · 966e8cc
2 parents a61b417 + c19bc10
commit 966e8cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -20,7 +20,7 @@ python-dateutil==2.8.2
     # via -r base.in
 pyyaml==6.0
     # via confuse
-scipp==0.17.0
+scipp==22.11.0
     # via -r base.in
 scipy==1.9.3
     # via -r base.in

diff --git a/src/scippnexus/nxtransformations.py b/src/scippnexus/nxtransformations.py
@@ -5,7 +5,10 @@
 from typing import Union
 import scipp as sc
 import scipp.spatial
-import scipp.interpolate
+try:
+    from scipp.scipy import interpolate
+except ImportError:  # scipp<22.11
+    from scipp import interpolate
 from .nxobject import Field, NXobject, ScippIndex
 
 
@@ -85,10 +88,10 @@ def _interpolate_transform(transform, xnew):
     # scipy can't interpolate with a single value
     if transform.sizes["time"] == 1:
         transform = sc.concat([transform, transform], dim="time")
-    return sc.interpolate.interp1d(transform,
-                                   "time",
-                                   kind="previous",
-                                   fill_value="extrapolate")(xnew=xnew)
+    return interpolate.interp1d(transform,
+                                "time",
+                                kind="previous",
+                                fill_value="extrapolate")(xnew=xnew)
 
 
 def _smaller_unit(a, b):