Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ env:
# pytest-qt doesn't seem to be playing well when pyqt5 and pyside6
# are installed in the same environment
PYTEST_QT_API: pyqt5
# workaround for https://github.com/pyxem/pyxem/pull/1175
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock'
# pytest<9 is workaround for https://github.com/pyxem/pyxem/pull/1175
# tomli is needed for etspy test_version
# https://github.com/usnistgov/etspy/issues/24
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock tomli'
CONSTRUCTOR_VERSION: '3.14.0'
CONDA_STANDALONE: '24.11.0'
ROSETTASCIIO_CACHE_NUMBER: 0 # Increase this value to reset cache
Expand Down Expand Up @@ -381,6 +383,13 @@ jobs:
# https://github.com/pyxem/kikuchipy/pull/749
pytest --pyargs kikuchipy -k "not test_not_allow_download_raises and not spherical"

- name: Run test etspy
if: always()
run: |
conda activate "${{ env.install_dir }}"
# https://github.com/usnistgov/etspy/issues/24
pytest --pyargs etspy -k "not test_version"

- name: Upload Release Asset
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
Expand Down Expand Up @@ -584,6 +593,14 @@ jobs:
# https://github.com/pyxem/kikuchipy/pull/749
pytest --pyargs kikuchipy -k "not test_not_allow_download_raises and not spherical"

# astra-toolbox wheel not available for windows on pypi
# - name: Run test etspy
# if: always()
# run: |
# call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
# # https://github.com/usnistgov/etspy/issues/24
# pytest --pyargs etspy -k "not test_version"

- name: Upload Release Asset
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
Expand Down
8 changes: 8 additions & 0 deletions conda_distribution/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ channels:
- conda-forge
- nodefaults

mirrored_channels:
conda-forge:
- "https://conda.anaconda.org/conda-forge"
- "https://prefix.dev/conda-forge"

specs:
- abtem
- ase
Expand Down Expand Up @@ -45,6 +50,9 @@ specs:
- nb_conda_kernels
- nglview
- notebook
- orix !=0.14.0,!=0.14.1
# orix 0.13.0 doesn't depends on orix-base, so we need to exclude it to avoid both conflicting
- orix-base !=0.14.0,!=0.14.1
- ovito
- particlespy
- pillow
Expand Down
3 changes: 2 additions & 1 deletion requirement_portable_distribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ matplotlib-scalebar
nglview
numpy >2
numpy-quaternion
orix !=0.14.0,!=0.14.1
particlespy
pint >0.24
py4dstem
Expand All @@ -24,4 +25,4 @@ python-rapidjson
pyxem
rosettasciio[all]
scanning_drift_corr
start_jupyter_cm
start_jupyter_cm
Loading