Merge pull request #57 from ericpre/update_skip_tests

Update skipping tests
hyperspy · Jun 23, 2024 · ecae95d · ecae95d
2 parents 4b33287 + 1f881b4
commit ecae95d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -64,8 +64,7 @@ jobs:
     env:
       # EXTENSION: hyperspy-gui-ipywidgets hyperspy-gui-traitsui kikuchipy lumispy pyxem exspy holospy
       EXTENSION: hyperspy-gui-ipywidgets hyperspy-gui-traitsui lumispy pyxem exspy holospy
-      # Unpin pytest, when pyxem 0.18 is release
-      TEST_DEPS: pytest==7.4.4 pytest-xdist pytest-rerunfailures pytest-mpl filelock
+      TEST_DEPS: pytest pytest-xdist pytest-rerunfailures pytest-mpl filelock
     defaults:
       run:
         shell: bash -l {0}
@@ -138,7 +137,10 @@ jobs:
       - name: Install HyperSpy RnMinor
         if: contains(matrix.HYPERSPY_VERSION, 'RnMinor')
         run: |
-          pip install "hyperspy[all] @ git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_minor"
+          # Remove when https://github.com/hyperspy/hyperspy/pull/3388 is merged
+          # related to sympy pre-release
+          # pip install "hyperspy[all] @ git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_minor"
+          pip install "hyperspy[all] @ git+https://github.com/ericpre/hyperspy.git@fix_expression"
 
       - name: Install HyperSpy RnMajor
         if: contains(matrix.HYPERSPY_VERSION, 'RnMajor')
@@ -153,7 +155,9 @@ jobs:
       - name: Install Extension Dev
         if: contains(matrix.EXTENSION_VERSION, 'dev')
         run: |
-          pip install git+https://github.com/hyperspy/exspy.git
+          # pip install git+https://github.com/hyperspy/exspy.git
+          # Removed when https://github.com/hyperspy/exspy/pull/55 is merged
+          pip install git+https://github.com/ericpre/exspy.git@fix_EELSArctan_gradients
           pip install git+https://github.com/hyperspy/holospy.git
           pip install git+https://github.com/lumispy/lumispy.git
           # pip install git+https://github.com/pyxem/kikuchipy.git
@@ -178,8 +182,9 @@ jobs:
       - name: Run RosettaScio Test Suite
         if: ${{ always() }}
         run: |
-          # Remove test skipping once https://github.com/hyperspy/rosettasciio/pull/262 is released
-          python -m pytest --pyargs rsciio -n 2 -k "not test_hamamatsu_streak_loadwarnings"
+          # Remove skipping test when rosettasciio 0.6 is released
+          # https://github.com/hyperspy/rosettasciio/pull/282 
+          python -m pytest --pyargs rsciio -n 2 -k "not test_read_stack"
 
       - name: Run hyperspy_gui_ipywidgets Test Suite
         if: ${{ always() }}