From 1a50ce9b4b36da45f8a83cf5a149aa89be03df48 Mon Sep 17 00:00:00 2001 From: Magnus Date: Sun, 18 Feb 2024 19:03:22 +0100 Subject: [PATCH 1/3] Add Atomap to HyperSpy bundle: new version 0.4.0 works with HyperSpy 2.0 --- .github/workflows/release.yml | 2 +- conda_distribution/construct.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77ad267..00e8016 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -346,7 +346,7 @@ jobs: WP_EXE: winpython.exe WP_DIR_NAME: WPy64-31150 #LIB_TO_INSTALL: abtem ase atomap exspy graphviz holospy hdf5plugin hyperspy[all] hyperspyui kikuchipy lumispy matplotlib-scalebar nglview particlespy py4dstem pymatgen pystackreg python-rapidjson pyxem scanning_drift_corr start_jupyter_cm - LIB_TO_INSTALL: abtem ase exspy graphviz holospy hdf5plugin hyperspy[all] hyperspyui lumispy matplotlib-scalebar nglview particlespy py4dstem pymatgen pystackreg python-rapidjson pyxem scanning_drift_corr start_jupyter_cm + LIB_TO_INSTALL: abtem ase atomap exspy graphviz holospy hdf5plugin hyperspy[all] hyperspyui lumispy matplotlib-scalebar nglview particlespy py4dstem pymatgen pystackreg python-rapidjson pyxem scanning_drift_corr start_jupyter_cm steps: - uses: actions/checkout@v4 diff --git a/conda_distribution/construct.yaml b/conda_distribution/construct.yaml index 400003b..dd760bf 100644 --- a/conda_distribution/construct.yaml +++ b/conda_distribution/construct.yaml @@ -17,7 +17,7 @@ channels: specs: - abtem - ase - #- atomap + - atomap >=0.4.0 - conda >=23.11 - dask >=2023.6.0 - dask-labextension From bb1c65dcbe35cafcda8015eda24211eb58b3f0ee Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 18 Feb 2024 18:54:29 +0000 Subject: [PATCH 2/3] Run test suite of atomap --- .github/workflows/release.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00e8016..8688590 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -317,6 +317,13 @@ jobs: # test_offest_and_scale failure fixed in https://github.com/pyxem/pyxem/pull/1016 pytest --pyargs pyxem -k "not TestAddEllipseArrayAsMarkers and not test_offest_and_scale" + - shell: bash -l {0} + name: Run test atomap + if: always() + run: | + conda activate "${{ env.install_dir }}" + pytest --pyargs atomap + # - shell: bash -l {0} # name: Run test kikuchipy # if: always() @@ -496,6 +503,13 @@ jobs: call "${{ env.WP_DIR_NAME }}\scripts\env.bat" # cause of the TestAddEllipseArrayAsMarkers failure is unknown (seems to be on blas mkl only) pytest --pyargs pyxem -k "not TestAddEllipseArrayAsMarkers" + + - name: Run test atomap + if: always() + shell: cmd + run: | + call "${{ env.WP_DIR_NAME }}\scripts\env.bat" + pytest --pyargs atomap # - name: Run test kikuchipy # if: always() From 292a0e40aae175eba78ae80eabc6a98d30fb9dfd Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 18 Feb 2024 20:35:52 +0000 Subject: [PATCH 3/3] Skip interactive test atomap --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8688590..2f68b85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -322,7 +322,8 @@ jobs: if: always() run: | conda activate "${{ env.install_dir }}" - pytest --pyargs atomap + # Skip interactive test + pytest --pyargs atomap -k "not TestSelectAtomsWithGui" # - shell: bash -l {0} # name: Run test kikuchipy @@ -509,7 +510,8 @@ jobs: shell: cmd run: | call "${{ env.WP_DIR_NAME }}\scripts\env.bat" - pytest --pyargs atomap + # Skip interactive test + pytest --pyargs atomap -k "not TestSelectAtomsWithGui" # - name: Run test kikuchipy # if: always()