Skip to content

Commit c522c89

Browse files
authored
Merge pull request #143 from ericpre/conda-forge_mirror
Channel mirrors and exclude `orix` 0.14.0/0.14.1
2 parents 4d8bcf6 + 04f396a commit c522c89

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

.github/workflows/release.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ env:
2222
# pytest-qt doesn't seem to be playing well when pyqt5 and pyside6
2323
# are installed in the same environment
2424
PYTEST_QT_API: pyqt5
25-
# workaround for https://github.com/pyxem/pyxem/pull/1175
26-
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock'
25+
# pytest<9 is workaround for https://github.com/pyxem/pyxem/pull/1175
26+
# tomli is needed for etspy test_version
27+
# https://github.com/usnistgov/etspy/issues/24
28+
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock tomli'
2729
CONSTRUCTOR_VERSION: '3.14.0'
2830
CONDA_STANDALONE: '24.11.0'
2931
ROSETTASCIIO_CACHE_NUMBER: 0 # Increase this value to reset cache
@@ -381,6 +383,13 @@ jobs:
381383
# https://github.com/pyxem/kikuchipy/pull/749
382384
pytest --pyargs kikuchipy -k "not test_not_allow_download_raises and not spherical"
383385
386+
- name: Run test etspy
387+
if: always()
388+
run: |
389+
conda activate "${{ env.install_dir }}"
390+
# https://github.com/usnistgov/etspy/issues/24
391+
pytest --pyargs etspy -k "not test_version"
392+
384393
- name: Upload Release Asset
385394
if: startsWith(github.ref, 'refs/tags/')
386395
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
@@ -584,6 +593,14 @@ jobs:
584593
# https://github.com/pyxem/kikuchipy/pull/749
585594
pytest --pyargs kikuchipy -k "not test_not_allow_download_raises and not spherical"
586595
596+
# astra-toolbox wheel not available for windows on pypi
597+
# - name: Run test etspy
598+
# if: always()
599+
# run: |
600+
# call "${{ env.WP_DIR_NAME }}\scripts\env.bat"
601+
# # https://github.com/usnistgov/etspy/issues/24
602+
# pytest --pyargs etspy -k "not test_version"
603+
587604
- name: Upload Release Asset
588605
if: startsWith(github.ref, 'refs/tags/')
589606
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b

conda_distribution/construct.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ channels:
1616
- conda-forge
1717
- nodefaults
1818

19+
mirrored_channels:
20+
conda-forge:
21+
- "https://conda.anaconda.org/conda-forge"
22+
- "https://prefix.dev/conda-forge"
23+
1924
specs:
2025
- abtem
2126
- ase
@@ -45,6 +50,9 @@ specs:
4550
- nb_conda_kernels
4651
- nglview
4752
- notebook
53+
- orix !=0.14.0,!=0.14.1
54+
# orix 0.13.0 doesn't depends on orix-base, so we need to exclude it to avoid both conflicting
55+
- orix-base !=0.14.0,!=0.14.1
4856
- ovito
4957
- particlespy
5058
- pillow

requirement_portable_distribution.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ matplotlib-scalebar
1515
nglview
1616
numpy >2
1717
numpy-quaternion
18+
orix !=0.14.0,!=0.14.1
1819
particlespy
1920
pint >0.24
2021
py4dstem
@@ -24,4 +25,4 @@ python-rapidjson
2425
pyxem
2526
rosettasciio[all]
2627
scanning_drift_corr
27-
start_jupyter_cm
28+
start_jupyter_cm

0 commit comments

Comments
 (0)