Merge pull request #548 from sklam/enh/llvm9

Upgrade to LLVM9
numba · Jun 1, 2020 · 4bebc60 · 4bebc60
2 parents c4f5a08 + cea2e7e
commit 4bebc60
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 268 deletions.
diff --git a/README.rst b/README.rst
@@ -62,14 +62,15 @@ Compatibility
 
 llvmlite works with Python 3.6 and greater.
 
-As of version 0.29.0, llvmlite requires LLVM 7.0.x or later
+As of version 0.33.0, llvmlite requires LLVM 9.0.x.
 
 Historical compatibility table:
 
 =================  ========================
 llvmlite versions  compatible LLVM versions
 =================  ========================
-0.29.0 - ...       7.0.x, 7.1.x, 8.0.x
+0.33.0 - ...       9.0.x
+0.29.0 - 0.32.0    7.0.x, 7.1.x, 8.0.x
 0.27.0 - 0.28.0    7.0.x
 0.23.0 - 0.26.0    6.0.x
 0.21.0 - 0.22.0    5.0.x

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,7 @@
-# Environment based on https://github.com/rmcgibbo/python-appveyor-conda-example
+# VS2017 needed for LLVM 9
+image: Visual Studio 2017
 
+# Environment based on https://github.com/rmcgibbo/python-appveyor-conda-example
 environment:
   # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
   # /E:ON and /V:ON options are not enabled in the batch script intepreter

diff --git a/buildscripts/azure/azure-windows.yml b/buildscripts/azure/azure-windows.yml
@@ -4,7 +4,7 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
-  pool: 
+  pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     maxParallel: 11
@@ -27,7 +27,7 @@ jobs:
         call conda remove --all -q -y -n %CONDA_ENV%
         call conda create -n %CONDA_ENV% -q -y python=%PYTHON% cmake
         call activate %CONDA_ENV%
-        call conda install -y -q -c numba llvmdev="8.0*"
+        call conda install -y -q -c numba llvmdev="9.0*"
       displayName: 'Before Install'
 
     - script: |

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
@@ -17,6 +17,4 @@ conda create -n %CONDA_ENV% -q -y python=%PYTHON% cmake
 
 call activate %CONDA_ENV%
 @rem Install llvmdev
-%CONDA_INSTALL% -c numba llvmdev="8.0*"
-@rem Install enum34 for Python < 3.4
-if %PYTHON% LSS 3.4 (%CONDA_INSTALL% enum34)
+%CONDA_INSTALL% -c numba llvmdev="9.0*"
diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
@@ -27,7 +27,7 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-$CONDA_INSTALL -c numba llvmdev="8.0*"
+$CONDA_INSTALL -c numba llvmdev="9.0*"
 
 # Install the compiler toolchain, for osx, bootstrapping needed
 # which happens in build.sh