Skip to content

Commit

Permalink
Merge pull request #9371 from sklam/misc/relese0.59prep
Browse files Browse the repository at this point in the history
Pin versions for release0.59
  • Loading branch information
sklam committed Dec 14, 2023
2 parents 28e68e5 + 35afde5 commit 437b91b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
6 changes: 3 additions & 3 deletions buildscripts/condarecipe.local/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ requirements:
- numpy
- setuptools
# On channel https://anaconda.org/numba/
- llvmlite >=0.42.0dev0,<0.42
- llvmlite 0.42.*
# TBB devel version is to match TBB libs.
# NOTE: ppc64le and aarch64 are pending testing so excluded for now.
- tbb-devel >=2021.6 # [not (aarch64 or ppc64le)]
run:
- python >=3.9
# NumPy 1.22.0, 1.22.1, 1.22.2 are all broken for ufuncs, see #7756
- numpy >=1.22.3
- numpy >=1.22.3, <1.27
# On channel https://anaconda.org/numba/
- llvmlite >=0.42.0dev0,<0.42
- llvmlite 0.42.*
run_constrained:
# If TBB is present it must be at least version 2021.6
- tbb >=2021.6 # [not (aarch64 or ppc64le)]
Expand Down
2 changes: 2 additions & 0 deletions numba/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def extract_version(mod):
msg = (f"Numba needs NumPy 1.22 or greater. Got NumPy "
f"{numpy_version[0]}.{numpy_version[1]}.")
raise ImportError(msg)
elif numpy_version > (1, 26):
raise ImportError("Numba needs NumPy 1.26 or less")

try:
import scipy
Expand Down
7 changes: 4 additions & 3 deletions numba/testing/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ def git_diff_str(x):
parser.add_argument('-g', '--gitdiff', dest='gitdiff', type=git_diff_str,
default=False, nargs='?',
help=('Run tests from changes made against '
'origin/main as identified by `git diff`. '
'origin/release0.59 '
'as identified by `git diff`. '
'If set to "ancestor", the diff compares '
'against the common ancestor.'))
return parser
Expand Down Expand Up @@ -435,9 +436,9 @@ def _choose_gitdiff_tests(tests, *, use_common_ancestor=False):
path = os.path.join('numba', 'tests')
if use_common_ancestor:
print(f"Git diff by common ancestor")
target = 'origin/main...HEAD'
target = 'origin/release0.59...HEAD'
else:
target = 'origin/main..HEAD'
target = 'origin/release0.59..HEAD'
gdiff_paths = repo.git.diff(target, path, name_only=True).split()
# normalise the paths as they are unix style from repo.git.diff
gdiff_paths = [os.path.normpath(x) for x in gdiff_paths]
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
max_python_version = "3.13" # exclusive
min_numpy_build_version = "1.11"
min_numpy_run_version = "1.22"
max_numpy_run_version = "1.27"
min_llvmlite_version = "0.42.0dev0"
max_llvmlite_version = "0.43"

Expand Down Expand Up @@ -363,10 +364,11 @@ def check_file_at_path(path2file):

packages = find_packages(include=["numba", "numba.*"])

build_requires = ['numpy >={}'.format(min_numpy_build_version)]
build_requires = ['numpy >={},<{}'.format(min_numpy_build_version,
max_numpy_run_version)]
install_requires = [
'llvmlite >={},<{}'.format(min_llvmlite_version, max_llvmlite_version),
'numpy >={}'.format(min_numpy_run_version),
'numpy >={},<{}'.format(min_numpy_run_version, max_numpy_run_version),
]

metadata = dict(
Expand Down

0 comments on commit 437b91b

Please sign in to comment.