Merge pull request #1067 from gmarkall/llvm15

Use LLVM 15 by default, add experimental LLVM 16 support

.readthedocs.yaml

@@ -8,6 +8,11 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  apt_packages:
+    - llvm-15
+  jobs:
+    post_checkout:
+      - sed -i "s/'llvm-config'/'llvm-config-15'/g" ffi/build.py
 
 sphinx:
   configuration: docs/source/conf.py

azure-pipelines.yml

@@ -18,10 +18,10 @@ jobs:
         PYTHON: '3.12'
         CONDA_ENV: cienv
 
-      llvm15:
+      llvm16:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '16'
 
 - template: buildscripts/azure/azure-linux-macos.yml
   parameters:
@@ -67,10 +67,10 @@ jobs:
         CONDA_ENV: cienv
         WHEEL: 'yes'
 
-      llvm15:
+      llvm16:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '16'
 
 - template: buildscripts/azure/azure-windows.yml
   parameters:

buildscripts/azure/azure-windows.yml

@@ -22,10 +22,10 @@ jobs:
         PYTHON: '3.12'
         CONDA_ENV: cienv
 
-      llvm15:
+      llvm16:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '16'
 
   steps:
 

buildscripts/incremental/build.cmd

@@ -15,7 +15,7 @@ call activate %CONDA_ENV%
 @rem - https://github.com/conda-forge/llvmdev-feedstock/issues/175
 @rem - https://github.com/conda-forge/llvmdev-feedstock/pull/223
 @rem - https://github.com/MicrosoftDocs/visualstudio-docs/issues/7774
-if "%LLVM%"=="15" (
+if "%LLVM%"=="16" (
   call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
   if %errorlevel% neq 0 exit /b %errorlevel%
 )

buildscripts/incremental/setup_conda_environment.cmd

@@ -14,10 +14,10 @@ call activate %CONDA_ENV%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 @rem Install llvmdev
-if "%LLVM%"=="15" (
+if "%LLVM%"=="16" (
   set LLVMDEV_CHANNEL="conda-forge"
 ) else (
-  set LLVMDEV_CHANNEL="numba/label/dev"
+  set LLVMDEV_CHANNEL="numba"
 )
 
 call conda install -y -q -c %LLVMDEV_CHANNEL% llvmdev="%LLVM%" libxml2

buildscripts/incremental/setup_conda_environment.sh

@@ -27,10 +27,10 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-if [ "$LLVM" == "15" ]; then
-    $CONDA_INSTALL -c conda-forge llvmdev="15"
+if [ "$LLVM" == "16" ]; then
+    $CONDA_INSTALL -c conda-forge llvmdev="16"
 else
-    $CONDA_INSTALL -c numba/label/dev llvmdev="14.*"
+    $CONDA_INSTALL -c numba llvmdev="15.*"
 fi
 
 # Install the compiler toolchain, for osx, bootstrapping needed