File hyperspy-e2d6483-scipy-datasets-fix.patch of Package python-hyperspy
From e2d6483975d4d3e9f12f1fef077d9efbd125524d Mon Sep 17 00:00:00 2001
From: Eric Prestat <eric.prestat@gmail.com>
Date: Tue, 27 Sep 2022 18:12:54 +0100
Subject: [PATCH] Fix typo import `scipy.datasets`
---
hyperspy/tests/drawing/test_plot_markers.py | 6 +++---
hyperspy/tests/drawing/test_plot_signal1d.py | 2 +-
hyperspy/tests/drawing/test_plot_signal2d.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hyperspy/tests/drawing/test_plot_markers.py b/hyperspy/tests/drawing/test_plot_markers.py
index 9246422d24..ae53f11fa4 100644
--- a/hyperspy/tests/drawing/test_plot_markers.py
+++ b/hyperspy/tests/drawing/test_plot_markers.py
@@ -571,11 +571,11 @@ def test_plot_add_background_windows():
def test_iterate_markers():
from skimage.feature import peak_local_max
try:
+ # scipy >=1.10
+ from scipy.datasets import face
+ except ImportError:
# scipy <1.10
from scipy.misc import face
- except:
- # scipy >=1.10
- from scipy.dataset import face
ims = BaseSignal(face()).as_signal2D([1, 2])
index = np.array([peak_local_max(im.data, min_distance=100,
num_peaks=4) for im in ims])
diff --git a/hyperspy/tests/drawing/test_plot_signal1d.py b/hyperspy/tests/drawing/test_plot_signal1d.py
index 8be22ce9ab..466a7aa410 100644
--- a/hyperspy/tests/drawing/test_plot_signal1d.py
+++ b/hyperspy/tests/drawing/test_plot_signal1d.py
@@ -25,7 +25,7 @@
import pytest
try:
# scipy >=1.10
- from scipy.dataset import ascent, face
+ from scipy.datasets import ascent, face
except ImportError:
# scipy <1.10
from scipy.misc import ascent, face
diff --git a/hyperspy/tests/drawing/test_plot_signal2d.py b/hyperspy/tests/drawing/test_plot_signal2d.py
index ae5170b0cb..cfd519798e 100644
--- a/hyperspy/tests/drawing/test_plot_signal2d.py
+++ b/hyperspy/tests/drawing/test_plot_signal2d.py
@@ -23,7 +23,7 @@
import scipy.ndimage
try:
# scipy >=1.10
- from scipy.dataset import ascent, face
+ from scipy.datasets import ascent, face
except ImportError:
# scipy <1.10
from scipy.misc import ascent, face