Skip to content

Commit 43fe32c

Browse files
committed
Simplify setting shell using defaults
1 parent 6084efc commit 43fe32c

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ env:
2626
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock'
2727
CONSTRUCTOR_VERSION: '3.14.0'
2828

29+
defaults:
30+
run:
31+
shell: bash -el {0}
32+
2933
jobs:
3034
create_release_job:
3135
name: Create Release (on tag only)
@@ -160,10 +164,6 @@ jobs:
160164
env:
161165
DISPLAY: ':0'
162166

163-
defaults:
164-
run:
165-
shell: bash -el {0}
166-
167167
steps:
168168
- uses: actions/checkout@v6
169169
- uses: conda-incubator/setup-miniconda@v3
@@ -377,9 +377,14 @@ jobs:
377377
WP_EXE: winpython.exe
378378
WP_DIR_NAME: WPy64-31280
379379

380+
defaults:
381+
run:
382+
shell: cmd
383+
380384
steps:
381385
- uses: actions/checkout@v6
382386
- name: Download Winpython
387+
shell: powershell
383388
run: |
384389
Invoke-WebRequest -OutFile ${{ env.WP_EXE }} ${{ env.WP_URL }}
385390
ls
@@ -388,21 +393,20 @@ jobs:
388393
if ($file_hash -ne "${{ env.WP_SHA256 }}") { exit(1) }
389394
390395
- name: Install Winpython
396+
shell: powershell
391397
run: |
392398
.\${{ env.WP_EXE }} -y | Out-Null
393399
ls
394400
ls ${{ env.WP_DIR_NAME }}
395401
396402
- name: Install libraries
397-
shell: cmd
398403
run: |
399404
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
400405
where python
401406
where pip
402407
pip install -r requirement_portable_distribution.txt
403408
404409
- name: Pip list
405-
shell: cmd
406410
run: |
407411
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
408412
pip list
@@ -417,7 +421,6 @@ jobs:
417421
echo $installer_name
418422
419423
- name: Run pyclean in distribution folder
420-
shell: cmd
421424
run: |
422425
where pip
423426
pip install pyclean
@@ -446,94 +449,81 @@ jobs:
446449
echo ${{ env.asset_name }}
447450
448451
- name: Check latest available hyperspy version
449-
shell: cmd
450452
run: |
451453
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
452454
python check_hyperspy_latest.py
453455
454456
- name: Install testing libraries
455457
if: always()
456-
shell: cmd
457458
run: |
458459
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
459460
pip install ${{ env.TEST_DEPS }}
460461
461462
- name: Run test suite (HyperSpyUI)
462463
if: always()
463-
shell: cmd
464464
run: |
465465
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
466466
# Error on closing figure, not critical
467467
pytest --pyargs hyperspyui -k "not plotting"
468468
469469
- name: Run test hyperspy
470470
if: always()
471-
shell: cmd
472471
run: |
473472
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
474473
pytest --pyargs hyperspy --reruns 3 -n 2
475474
476475
- name: Run test RosettaSciIO
477476
if: always()
478-
shell: cmd
479477
run: |
480478
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
481479
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_mrcz.py and not test_usid.py"
482480
483481
- name: Run test hyperspy_gui_ipywidgets
484482
if: always()
485-
shell: cmd
486483
run: |
487484
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
488485
pytest --pyargs hyperspy_gui_ipywidgets
489486
490487
- name: Run test hyperspy_gui_traitsui
491488
if: always()
492-
shell: cmd
493489
run: |
494490
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
495491
pytest --pyargs hyperspy_gui_traitsui
496492
497493
- name: Run test exspy
498494
if: always()
499-
shell: cmd
500495
run: |
501496
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
502497
pytest --pyargs exspy
503498
504499
- name: Run test holospy
505500
if: always()
506-
shell: cmd
507501
run: |
508502
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
509503
pytest --pyargs holospy
510504
511505
- name: Run test lumispy
512506
if: always()
513-
shell: cmd
514507
run: |
515508
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
516509
pytest --pyargs lumispy
517510
518511
- name: Run test pyxem
519512
if: always()
520-
shell: cmd
521513
run: |
522514
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
523515
# cause of the TestAddEllipseArrayAsMarkers failure is unknown (seems to be on blas mkl only)
524516
pytest --pyargs pyxem -k "not TestAddEllipseArrayAsMarkers"
525517
526518
- name: Run test atomap
527519
if: always()
528-
shell: cmd
529520
run: |
530521
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
531522
# Skip interactive test
532523
pytest --pyargs atomap -k "not TestSelectAtomsWithGui"
533524
534525
- name: Run test kikuchipy
535526
if: always()
536-
shell: cmd
537527
run: |
538528
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
539529
# https://github.com/pyxem/kikuchipy/issues/707

0 commit comments

Comments
 (0)