File tree Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -140,7 +140,13 @@ jobs:
140
140
- name : Install mkl_fft
141
141
run : |
142
142
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143
- conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest "scipy>=1.10" $CHANNELS
143
+ conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
144
+ if [[ "${{ matrix.python }}" != 3.9* ]]; then
145
+ # Intel channel only has scipy=1.10 for Python 3.9, which needs mkl<2025
146
+ # while scipy needs to install numpy and mkl_random and mkl_random-1.2.11 requires mkl>=2025
147
+ # so avoid installing scipy for Python 3.9 which means third_party/scipy tests will not run
148
+ conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
149
+ fi
144
150
# Test installed packages
145
151
conda list -n ${{ env.TEST_ENV_NAME }}
146
152
@@ -307,8 +313,11 @@ jobs:
307
313
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
308
314
SET PACKAGE_VERSION=%%F
309
315
)
310
- SET "TEST_DEPENDENCIES=pytest scipy "
316
+ SET "TEST_DEPENDENCIES=pytest"
311
317
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
318
+ if ("${{ matrix.python }}" -ne "3.9") {
319
+ conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
320
+ }
312
321
313
322
- name : Report content of test environment
314
323
shell : cmd /C CALL {0}
Original file line number Diff line number Diff line change @@ -20,13 +20,12 @@ requirements:
20
20
- python
21
21
- setuptools >=77
22
22
- mkl-devel
23
- - mkl-devel 2024.2.* # [py==39]
24
23
- cython
25
24
- numpy-base
26
25
run :
27
26
- python
28
27
- mkl-service
29
- - {{ pin_compatible('numpy') }}
28
+ - {{ pin_compatible('numpy-base ') }}
30
29
31
30
test :
32
31
commands :
You can’t perform that action at this time.
0 commit comments