Skip to content

Commit

Permalink
Merge pull request #6463 from stuartarchibald/wip/llvmlite_036
Browse files Browse the repository at this point in the history
Bump llvmlite to 0.36 series
  • Loading branch information
sklam committed Nov 10, 2020
2 parents b369047 + e6e060c commit 9f45b07
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions buildscripts/condarecipe.local/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ requirements:
- numpy
- setuptools
# On channel https://anaconda.org/numba/
- llvmlite >=0.35.0dev0,<0.35
- llvmlite >=0.36.0dev0,<0.36
# TBB devel version is to match TBB libs.
# 2020.3 is the last version with the "old" ABI
- tbb-devel >=2019.5,<=2020.3 # [not (armv6l or armv7l or aarch64 or linux32)]
Expand All @@ -44,7 +44,7 @@ requirements:
- numpy >=1.15
- setuptools
# On channel https://anaconda.org/numba/
- llvmlite >=0.35.0dev0,<0.35
- llvmlite >=0.36.0dev0,<0.36
run_constrained:
# If TBB is present it must be at least version 2019.5 from Anaconda due to
# build flag issues triggering UB. It must also be <=2020.3 due to ABI
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setuptools
numpy>=1.10
llvmlite>=0.35.0dev0,<0.36
llvmlite>=0.36.0dev0,<0.37
argparse
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
min_python_version = "3.6"
min_numpy_build_version = "1.11"
min_numpy_run_version = "1.15"
min_llvmlite_version = "0.35.0.dev0"
max_llvmlite_version = "0.36"
min_llvmlite_version = "0.36.0.dev0"
max_llvmlite_version = "0.37"

if sys.platform.startswith('linux'):
# Patch for #2555 to make wheels without libpython
Expand Down

0 comments on commit 9f45b07

Please sign in to comment.