From d3f87d30c68b2a857cd24676891c9ef15cdd255e Mon Sep 17 00:00:00 2001
From: Stuart Archibald <stuartarchibald@users.noreply.github.com>
Date: Tue, 4 Oct 2022 12:49:39 +0100
Subject: [PATCH 1/2] Restrict the TBB development package to supported version
 in Azure.

As title, tbb-devel>2021.5 is not supported.
---
 buildscripts/incremental/setup_conda_environment.cmd | 2 +-
 buildscripts/incremental/setup_conda_environment.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
index c192e14828e..3cb991f7846 100644
--- a/buildscripts/incremental/setup_conda_environment.cmd
+++ b/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:"
diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
index 370f973d007..070818caaaf 100755
--- a/buildscripts/incremental/setup_conda_environment.sh
+++ b/buildscripts/incremental/setup_conda_environment.sh
@@ -80,7 +80,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

From d13f8cbe14070cac622ca1f32c8d75c90ddde187 Mon Sep 17 00:00:00 2001
From: Stuart Archibald <stuartarchibald@users.noreply.github.com>
Date: Tue, 4 Oct 2022 13:01:38 +0100
Subject: [PATCH 2/2] Remove explicit TBB installation step on windows Azure
 builds.

As title. This is covered by the "setup_conda_environment.cmd"
script.
---
 buildscripts/azure/azure-windows.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/buildscripts/azure/azure-windows.yml b/buildscripts/azure/azure-windows.yml
index 9170334298b..244b615d7d5 100644
--- a/buildscripts/azure/azure-windows.yml
+++ b/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'