Merge pull request #12 from ericpre/fix_hyperspy_api_change

Fix tests after api changes in hyperspy
hyperspy · Nov 9, 2023 · 870b571 · 870b571
2 parents 7be640b + 77f9a38
commit 870b571
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/exspy/test/models/test_edsmodel.py b/exspy/test/models/test_edsmodel.py
@@ -291,7 +291,7 @@ def setup_method(self, method):
  s.axes_manager.create_axes([{"size": mix.shape[0], "navigate": True}] * 2 + [a])
  s.add_elements(s2.metadata.Sample.elements)
 
- for d, m in zip(s._iterate_signal(), mix.flatten()):
+ for d, m in zip(s._iterate_signal(iterpath="flyback"), mix.flatten()):
  d[:] = d * m + (1 - m) * s2.data
  self.mix = mix
  self.s = s

diff --git a/exspy/test/models/test_linear_model.py b/exspy/test/models/test_linear_model.py
@@ -97,7 +97,7 @@ def test_fit_fixed_twinned_components_and_std(self):
 
 class TestWarningSlowMultifit:
  def setup_method(self, method):
- s = hs.datasets.two_gaussians().inav[0]
+ s = hs.data.two_gaussians().inav[0]
  s.set_signal_type("EELS")
  m = s.create_model(auto_background=False, auto_add_edges=False)
  g1 = Gaussian(centre=40)