pyxem · hakonanes · Nov 3, 2023 · Feb 11, 2023 · Feb 11, 2023 · Feb 11, 2023
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -61,9 +61,11 @@ jobs:
         include:
           - os: ubuntu-latest
             python-version: 3.7
-            OLDEST_SUPPORTED_VERSION: true
             DEPENDENCIES: dask==2021.8.1 diffsims==0.5.0 hyperspy==1.7.3 matplotlib==3.3 numba==0.55 numpy==1.19 orix==0.11.0 scikit-image==0.16.2
             LABEL: -oldest
+          - os: ubuntu-latest
+            python-version: 3.10
+            LABEL: -minimum_requirement
     steps:
       - uses: actions/checkout@v3
 
@@ -79,11 +81,12 @@ jobs:
           pip install -U -e .'[tests]'
 
       - name: Install oldest supported version
-        if: ${{ matrix.OLDEST_SUPPORTED_VERSION }}
+        if: contains(matrix.LABEL, 'oldest')
         run: |
           pip install ${{ matrix.DEPENDENCIES }}
 
       - name: Install optional dependencies
+        if: ${{ contains(matrix.LABEL, 'minimum_requirement') == false }}
         shell: bash
         run: |
           pip install -e .'[all]'

diff --git a/kikuchipy/indexing/_hough_indexing.py b/kikuchipy/indexing/_hough_indexing.py
@@ -148,7 +148,7 @@ def _get_indexer_from_detector(
     dependency of kikuchipy. See :ref:`optional-dependencies` for
     details.
     """
-    if not _pyebsdindex_installed:  # pragma: no cover
+    if not _pyebsdindex_installed:
         raise ValueError(
             "pyebsdindex must be installed. Install with pip install pyebsdindex. "
             "See https://kikuchipy.org/en/stable/user/installation.html for "

diff --git a/kikuchipy/signals/tests/test_ebsd_hough_indexing.py b/kikuchipy/signals/tests/test_ebsd_hough_indexing.py
@@ -27,6 +27,9 @@
 )
 
 
+@pytest.mark.skipif(
+    not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
+)
 class TestHoughIndexing:
     def setup_method(self):
         s = kp.data.nickel_ebsd_small()
@@ -39,9 +42,6 @@ def setup_method(self):
         self.detector = s.detector
         self.indexer = s.detector.get_indexer(s.xmap.phases)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_print_information(self):
         det = self.detector
         det.shape = (4, 5)  # Save time on indexer creation
@@ -66,9 +66,6 @@ def test_hough_indexing_print_information(self):
         info_list2 = info2.split("\n")
         assert info_list2[2] == "  Projection center: (0.4251, 0.2134, 0.5007)"
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing(self):
         # Reference results (Hough indexing + refinement)
         xmap_ref = self.xmap
@@ -83,19 +80,13 @@ def test_hough_indexing(self):
         angles = xmap.orientations.angle_with(xmap_ref.orientations, degrees=True)
         assert np.all(angles < 1)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_plot_transform(self):
         _ = self.signal.hough_indexing(self.phase_list, self.indexer, verbose=2)
         ax = plt.gca()
         assert len(ax.texts) == 9
         for i, text in enumerate(ax.texts):
             assert text.get_text() == str(i + 1)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_lazy(self):  # pragma: no cover
         s = self.signal.as_lazy()
 
@@ -110,9 +101,6 @@ def test_hough_indexing_lazy(self):  # pragma: no cover
             assert np.allclose(xmap1.rotations.data, xmap2.rotations.data)
             assert np.allclose(xmap1.fit, xmap2.fit)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_return_index_data(self):
         phase_list = self.phase_list
         xmap, index_data = self.signal.hough_indexing(
@@ -132,9 +120,6 @@ def test_hough_indexing_return_index_data(self):
         assert np.allclose(xmap2.fit, xmap.fit)
         assert np.allclose(xmap2.cm, xmap.cm)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_return_band_data(self):
         indexer = self.detector.get_indexer(self.phase_list, nBands=8)
         _, band_data = self.signal.hough_indexing(
@@ -154,22 +139,11 @@ def test_hough_indexing_return_band_data(self):
         assert index_data.shape == (2, 9)
         assert band_data.shape == (9, 9)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_raises_dissimilar_phase_lists(self):
         phase_list = PhaseList(names=["a", "b"], space_groups=[225, 229])
         with pytest.raises(ValueError, match=r"`indexer.phaselist` \['FCC'\] and the "):
             _ = self.signal.hough_indexing(phase_list, self.indexer)
 
-    @pytest.mark.skipif(kp._pyebsdindex_installed, reason="pyebsdindex is installed")
-    def test_hough_indexing_raises_pyebsdindex(self):  # pragma: no cover
-        with pytest.raises(ValueError, match="Hough indexing requires pyebsdindex to "):
-            _ = self.signal.hough_indexing(self.phase_list, self.indexer)
-
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_indexer_is_compatible_with_signal(self):
         indexer = self.indexer
 
@@ -217,9 +191,6 @@ def test_indexer_is_compatible_with_signal(self):
                 indexer, (60, 60), 9, raise_if_not=True
             )
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_hough_indexing_get_xmap_from_index_data(self):
         phase_list = self.phase_list
         xmap, index_data = self.signal.hough_indexing(
@@ -256,9 +227,6 @@ def test_hough_indexing_get_xmap_from_index_data(self):
         assert xmap2.dy == 2
         assert xmap2.dx == 3
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_optimize_pc(self):
         # Batch
         det2 = self.signal.hough_indexing_optimize_pc(
@@ -278,19 +246,13 @@ def test_optimize_pc(self):
         assert np.isclose(det2.tilt, self.detector.tilt)
         assert np.isclose(det2.px_size, self.detector.px_size)
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_optimize_pc_pso(self):
         det = self.signal.hough_indexing_optimize_pc(
             self.detector.pc_average, self.indexer, method="PSO"
         )
         # Results are not deterministic, so we give a wide range here...
         assert abs(self.detector.pc_average - det.pc_average).max() < 0.05
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
     def test_optimize_pc_raises(self):
         with pytest.raises(ValueError, match="`pc0` must be of size 3"):
             _ = self.signal.hough_indexing_optimize_pc([0.5, 0.5], self.indexer)
@@ -305,22 +267,34 @@ def test_optimize_pc_raises(self):
                 [0.5, 0.5, 0.5], self.indexer, method="PSO", batch=True
             )
 
-    @pytest.mark.skipif(
-        not kp._pyebsdindex_installed, reason="pyebsdindex is not installed"
-    )
-    def test_optimize_pc_lazy(self):  # pragma: no cover
+    def test_optimize_pc_lazy(self):
         s = self.signal.as_lazy()
 
         from pyebsdindex import _pyopencl_installed
 
         if not _pyopencl_installed:
             with pytest.raises(ValueError, match="Hough indexing of lazy signals must"):
                 _ = s.hough_indexing_optimize_pc(self.detector.pc_average, self.indexer)
-        else:
+        else:  # pragma: no cover
             det = s.hough_indexing_optimize_pc(self.detector.pc_average, self.indexer)
             assert np.allclose(det.pc_average, self.detector.pc_average, atol=1e-2)
 
-    @pytest.mark.skipif(kp._pyebsdindex_installed, reason="pyebsdindex is installed")
-    def test_optimize_pc_raises_pyebsdindex(self):  # pragma: no cover
-        with pytest.raises(ValueError, match="Hough indexing requires pyebsdindex to "):
-            _ = self.signal.hough_indexing_optimize_pc([0.5, 0.5, 0.5], self.indexer)
+
+@pytest.mark.skipif(kp._pyebsdindex_installed, reason="pyebsdindex is installed")
+class TestHoughIndexingNopyebsdindex:
+    def setup_method(self):
+        s = kp.data.nickel_ebsd_small()
+
+        self.signal = s
+
+    def test_get_indexer(self):
+        with pytest.raises(ValueError, match="pyebsdindex must be installed"):
+            _ = self.signal.detector.get_indexer(None)
+
+    def test_hough_indexing_raises_pyebsdindex(self):  # pragma: no cover
+        with pytest.raises(ValueError, match="pyebsdindex to be installed"):
+            _ = self.signal.hough_indexing(None, None)
+
+    def test_optimize_pc_raises_pyebsdindex(self):
+        with pytest.raises(ValueError, match="pyebsdindex to be installed"):
+            _ = self.signal.hough_indexing_optimize_pc(None, None)