From d25cf26476a57ea75a4c63f34e72720295456171 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 23 Jun 2024 12:41:31 +0100 Subject: [PATCH 1/2] Update skipping tests --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 12cbb20..18dd539 100644 --- 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} @@ -178,8 +177,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() }} From 1f881b47e9c6940570ac102fd673c2c2ac56b0d5 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 23 Jun 2024 13:12:42 +0100 Subject: [PATCH 2/2] Use dev branch that supports sympy pre-release --- .github/workflows/tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 18dd539..c2e38dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,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') @@ -152,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