Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin versions for release0.59 #9371

Merged
merged 5 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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: 1 addition & 1 deletion docs/source/user/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ information.
+----------++--------------+---------------------------+----------------------------+------------------------------+-------------------+-----------------------------+
| Numba | Release date | Python | NumPy | llvmlite | LLVM | TBB |
+===========+==============+===========================+============================+==============================+===================+=============================+
| 0.59.0 | UNRELEASED | 3.9.x <= version < 3.13 | 1.22 <= version < 1.27 | 0.42.x | 14.x | 2021.6 <= version |
| 0.59.0 | 2023-12-14 | 3.9.x <= version < 3.13 | 1.22 <= version < 1.27 | 0.42.x | 14.x | 2021.6 <= version |
sklam marked this conversation as resolved.
Show resolved Hide resolved
+-----------+--------------+---------------------------+----------------------------+------------------------------+-------------------+-----------------------------+
| 0.58.1 | 2023-10-17 | 3.8.x <= version < 3.12 | 1.22 <= version < 1.27 | 0.41.x | 14.x | 2021.6 <= version |
+-----------+--------------+---------------------------+----------------------------+------------------------------+-------------------+-----------------------------+
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)]
sklam marked this conversation as resolved.
Show resolved Hide resolved
sklam marked this conversation as resolved.
Show resolved Hide resolved
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),
sklam marked this conversation as resolved.
Show resolved Hide resolved
]

metadata = dict(
Expand Down