File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -357,8 +357,6 @@ jobs:
357357 ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
358358 ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
359359
360- # add intel-openmp as an explicit dependency
361- # to avoid it being missed when package version is specified exactly
362360 - name : Install mkl_umath
363361 shell : cmd /C CALL {0}
364362 run : |
@@ -371,9 +369,7 @@ jobs:
371369 SET PACKAGE_VERSION=%%F
372370 )
373371 SET "TEST_DEPENDENCIES=pytest pytest-cov"
374- SET "WORKAROUND_DEPENDENCIES=intel-openmp"
375- SET "DEPENDENCIES=%TEST_DEPENDENCIES% %WORKAROUND_DEPENDENCIES%"
376- conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
372+ conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
377373
378374 - name : Report content of test environment
379375 shell : cmd /C CALL {0}
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ requirements:
3333 - numpy # [not win]
3434 - numpy <2.4 # [win]
3535 # TODO: remove win numpy pin when numpy 2.5 is released, see https://github.com/numpy/numpy/issues/31337
36- - llvm-openmp # [linux]
36+ - llvm-openmp
3737 run :
3838 - python
3939 - python-gil # [py>=314]
You can’t perform that action at this time.
0 commit comments