Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Atomap to HyperSpy bundle: new version 0.4.0 works with HyperSpy 2.0 #99

Merged
merged 3 commits into from
Feb 18, 2024
Merged

Add Atomap to HyperSpy bundle: new version 0.4.0 works with HyperSpy 2.0 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a50ce9
Add Atomap to HyperSpy bundle: new version 0.4.0 works with HyperSpy 2.0
magnunor Feb 18, 2024
bb1c65d
Run test suite of atomap
ericpre Feb 18, 2024
292a0e4
Skip interactive test atomap
ericpre Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,14 @@ 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 }}"
# Skip interactive test
pytest --pyargs atomap -k "not TestSelectAtomsWithGui"

# - shell: bash -l {0}
# name: Run test kikuchipy
# if: always()
Expand Down Expand Up @@ -346,7 +354,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
Expand Down Expand Up @@ -496,6 +504,14 @@ 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"
# Skip interactive test
pytest --pyargs atomap -k "not TestSelectAtomsWithGui"

# - name: Run test kikuchipy
# if: always()
Expand Down
2 changes: 1 addition & 1 deletion conda_distribution/construct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ channels:
specs:
- abtem
- ase
#- atomap
- atomap >=0.4.0
- conda >=23.11
- dask >=2023.6.0
- dask-labextension
Expand Down