Merge pull request numba#8486 from stuartarchibald/wip/fix_tbb_2021_c…

…onstraint_azure

Restrict the TBB development package to supported version in Azure.

buildscripts/azure/azure-windows.yml

@@ -29,12 +29,6 @@ jobs:
         buildscripts\\incremental\\setup_conda_environment.cmd
       displayName: 'Before Install'
 
-    - script: |
-        # use TBB
-        call activate %CONDA_ENV%
-        conda install -y -c numba tbb=2021 tbb-devel
-      displayName: 'Add in TBB'
-
     - script: |
         buildscripts\\incremental\\build.cmd
       displayName: 'Build'

buildscripts/incremental/setup_conda_environment.cmd

@@ -36,7 +36,7 @@ if "%BUILD_DOC%" == "yes" (%CONDA_INSTALL% sphinx sphinx_rtd_theme pygments)
 @rem Install dependencies for code coverage (codecov.io)
 if "%RUN_COVERAGE%" == "yes" (%PIP_INSTALL% codecov)
 @rem Install TBB
-%CONDA_INSTALL% -c numba tbb=2021 tbb-devel
+%CONDA_INSTALL% -c numba tbb=2021 "tbb-devel>=2021,<2021.6"
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo "DEBUG ENV:"

buildscripts/incremental/setup_conda_environment.sh

@@ -104,7 +104,7 @@ if [ "$RUN_COVERAGE" == "yes" ]; then $PIP_INSTALL codecov; fi
 # Install SVML
 if [ "$TEST_SVML" == "yes" ]; then $CONDA_INSTALL -c numba icc_rt; fi
 # Install Intel TBB parallel backend
-if [ "$TEST_THREADING" == "tbb" ]; then $CONDA_INSTALL -c numba tbb=2021 tbb-devel; fi
+if [ "$TEST_THREADING" == "tbb" ]; then $CONDA_INSTALL -c numba tbb=2021 "tbb-devel>=2021,<2021.6"; fi
 # Install pickle5
 if [ "$TEST_PICKLE5" == "yes" ]; then $PIP_INSTALL pickle5; fi
 # Install typeguard