Skip to content

Commit

Permalink
Merge pull request #110 from ericpre/update_version
Browse files Browse the repository at this point in the history
Update bundle
  • Loading branch information
ericpre authored Jun 24, 2024
2 parents a21f567 + ca283ca commit 3eae3bc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ permissions:

env:
MPLBACKEND: 'agg'
# pin pytest to 7.4.4 to get the test suite of pyxem to work
TEST_DEPS: pytest==7.4.4 pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock
TEST_DEPS: pytest pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock

jobs:
create_release_job:
Expand Down Expand Up @@ -264,9 +263,9 @@ jobs:
if: always()
run: |
conda activate "${{ env.install_dir }}"
# teardown in test_quantumdetector.py doesn't play well with pytest setup
# revisit when pytest 7.4.4 is unpinned
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_quantumdetector.py"
# Remove skipping test when rosettasciio 0.6 is released
# https://github.com/hyperspy/rosettasciio/pull/282
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_read_stack"
- shell: bash -l {0}
name: Test hyperspy
Expand Down Expand Up @@ -317,8 +316,7 @@ jobs:
run: |
conda activate "${{ env.install_dir }}"
# cause of the TestAddEllipseArrayAsMarkers failure is unknown (seems to be on blas mkl only)
# 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"
pytest --pyargs pyxem -k "not TestAddEllipseArrayAsMarkers"
- shell: bash -l {0}
name: Run test atomap
Expand Down Expand Up @@ -461,7 +459,9 @@ jobs:
shell: cmd
run: |
call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_quantumdetector.py"
# Remove skipping test when rosettasciio 0.6 is released
# https://github.com/hyperspy/rosettasciio/pull/282
pytest --pyargs rsciio --reruns 3 -n 2 -k "not test_read_stack"
- name: Run test hyperspy_gui_ipywidgets
if: always()
Expand Down
4 changes: 2 additions & 2 deletions conda_distribution/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ specs:
- python 3.11*
- python-graphviz
- python-rapidjson
- pyxem >=0.18
- pyxem >=0.19.1
- openpyxl
- qtconsole >=5.4.3
- rosettasciio >=0.4
- rosettasciio >=0.5
- scanning_drift_corr
- spyder >=5.4.3
- start_jupyter_cm
Expand Down

0 comments on commit 3eae3bc

Please sign in to comment.