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:
140140 - name : Install mkl_fft
141141 run : |
142142 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
144150 # Test installed packages
145151 conda list -n ${{ env.TEST_ENV_NAME }}
146152
@@ -307,8 +313,11 @@ jobs:
307313 FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
308314 SET PACKAGE_VERSION=%%F
309315 )
310- SET "TEST_DEPENDENCIES=pytest scipy "
316+ SET "TEST_DEPENDENCIES=pytest"
311317 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+ }
312321
313322 - name : Report content of test environment
314323 shell : cmd /C CALL {0}
Original file line number Diff line number Diff line change @@ -24,14 +24,13 @@ requirements:
2424 - pip
2525 - setuptools >=77
2626 - mkl-devel
27- - mkl-devel 2024.2.* # [py==39]
2827 - cython
2928 - numpy-base
3029 - wheel >=0.41.3
3130 run :
3231 - python
3332 - mkl-service
34- - {{ pin_compatible('numpy') }}
33+ - {{ pin_compatible('numpy-base ') }}
3534
3635test :
3736 commands :
You can’t perform that action at this time.
0 commit comments