Skip to content

Commit 134113c

Browse files
authored
Merge pull request hyperspy#123 from ericpre/update_bundle
Update bundle
2 parents cee92fb + ab2ec20 commit 134113c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Install constructor
131131
run: |
132-
conda install constructor=3.9.3
132+
conda install constructor>=3.11.2
133133
134134
- name: Conda info
135135
run: |
@@ -246,13 +246,14 @@ jobs:
246246
if: always()
247247
run: |
248248
conda activate "${{ env.install_dir }}"
249-
pytest --pyargs rsciio --reruns 3 -n 1 -k "not TestOperate"
249+
pytest --pyargs rsciio --reruns 3 -n 1 -k "not TestOperate and not test_export_scalebar and not test_load_readonly and not test_lazy_loading_hyperspy_close"
250250
251251
- name: Test hyperspy
252252
if: always()
253253
run: |
254254
conda activate "${{ env.install_dir }}"
255-
pytest --pyargs hyperspy --reruns 3 -n 2
255+
# test_rank_lstsq_residual fails on windows with MKL
256+
pytest --pyargs hyperspy --reruns 3 -n 2 -k "not test_arpack"
256257
257258
- name: Test hyperspy_gui_ipywidgets
258259
if: always()
@@ -432,7 +433,7 @@ jobs:
432433
shell: cmd
433434
run: |
434435
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
435-
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_mrcz.py and not test_usid.py and not TestOperate"
436+
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_mrcz.py and not test_usid.py and not TestOperate and not test_lazy_loading_hyperspy_close"
436437
437438
- name: Run test hyperspy_gui_ipywidgets
438439
if: always()

conda_distribution/construct.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ channels:
1919
specs:
2020
- abtem
2121
- ase
22-
- atomap >=0.4.1
23-
- conda >=24.11.3
24-
# use <2024.12.0 until https://github.com/hyperspy/hyperspy/pull/3476 is released
25-
- dask-core >=2023.6.0,<2024.12.0
22+
- atomap >=0.4.2
23+
- conda >=25.1.1
24+
- dask-core >=2023.6.0
2625
- dask-labextension
2726
- dask-image
2827
# etspy has a tight pinning on numba (even if it doesn't use)
@@ -31,11 +30,11 @@ specs:
3130
- exspy
3231
- hdf5plugin
3332
- holospy
34-
- hyperspy >=2.2.0
33+
- hyperspy >=2.3.0
3534
- hyperspyui >=2.0.2
3635
- ipympl
3736
- jupyterlab
38-
- kikuchipy >=0.11
37+
- kikuchipy >=0.11.2
3938
- libblas=*=*{{ blas_impl }}
4039
- lumispy >=0.2.2
4140
- mamba >=2.0.5

0 commit comments

Comments
 (0)