Skip to content

Commit c7f14cf

Browse files
authored
Merge pull request #10726 from swap357/pin_deps_0.67
update test refs and pin dependencies for release0.67
2 parents 0c89330 + 123fa28 commit c7f14cf

5 files changed

Lines changed: 17 additions & 10 deletions

File tree

‎buildscripts/condarecipe.local/meta.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ requirements:
3434
- numpy
3535
- setuptools >=69.0.0
3636
# On channel https://anaconda.org/numba/
37-
- llvmlite >=0.49.0dev0,<0.49
37+
- llvmlite 0.49.*
3838
# TBB devel version is to match TBB libs.
3939
# NOTE: ppc64le and aarch64 are pending testing so excluded for now.
4040
- tbb-devel >=2021.6 # [not (aarch64 or ppc64le)]
4141
run:
4242
- python >=3.10
43-
- numpy >=1.22.3
43+
- numpy >=1.22.3, < 2.6
4444
# On channel https://anaconda.org/numba/
45-
- llvmlite >=0.49.0dev0,<0.49
45+
- llvmlite 0.49.*
4646
run_constrained:
4747
# If TBB is present it must be at least version 2021.6
4848
- tbb >=2021.6 # [not (aarch64 or ppc64le)]

‎maint/towncrier_rst_validator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def list_rst_filename() -> str:
4141
]
4242
else:
4343
output = check_output(
44-
["git", "diff", "--name-only", "origin/main"],
44+
["git", "diff", "--name-only", "origin/release0.67"],
4545
encoding="utf-8",
4646
stderr=STDOUT,
4747
)

‎numba/__init__.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ def extract_version(mod):
3939
f"{numpy_version[0]}.{numpy_version[1]}.")
4040
raise ImportError(msg)
4141

42+
if numpy_version > (2, 5):
43+
msg = (f"Numba needs NumPy 2.5 or less. Got NumPy "
44+
f"{numpy_version[0]}.{numpy_version[1]}.")
45+
raise ImportError(msg)
46+
4247
try:
4348
import scipy
4449
except ImportError:

‎numba/testing/main.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def git_diff_str(x):
260260
parser.add_argument('-g', '--gitdiff', dest='gitdiff', type=git_diff_str,
261261
default=False, nargs='?',
262262
help=('Run tests from changes made against '
263-
'origin/main as identified by `git diff`. '
263+
'origin/release0.67 as identified by `git diff`. '
264264
'If set to "ancestor", the diff compares '
265265
'against the common ancestor.'))
266266
return parser
@@ -452,9 +452,9 @@ def _choose_gitdiff_tests(tests, *, use_common_ancestor=False):
452452
path = os.path.join('numba', 'tests')
453453
if use_common_ancestor:
454454
print(f"Git diff by common ancestor")
455-
target = 'origin/main...HEAD'
455+
target = 'origin/release0.67...HEAD'
456456
else:
457-
target = 'origin/main..HEAD'
457+
target = 'origin/release0.67..HEAD'
458458
gdiff_paths = repo.git.diff(target, path, name_only=True).split()
459459
# normalise the paths as they are unix style from repo.git.diff
460460
gdiff_paths = [os.path.normpath(x) for x in gdiff_paths]

‎setup.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121

2222
min_python_version = "3.10"
2323
max_python_version = "3.15" # exclusive
24-
min_numpy_build_version = "1.11"
24+
min_numpy_build_version = "2.0.0rc1"
2525
min_numpy_run_version = "1.22"
26+
max_numpy_run_version = "2.6"
2627
min_llvmlite_version = "0.49.0dev0"
2728
max_llvmlite_version = "0.50"
2829

@@ -381,10 +382,11 @@ def check_file_at_path(path2file):
381382

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

384-
build_requires = ['numpy >={}'.format(min_numpy_build_version)]
385+
build_requires = ['numpy >={},<{}'.format(min_numpy_build_version,
386+
max_numpy_run_version)]
385387
install_requires = [
386388
'llvmlite >={},<{}'.format(min_llvmlite_version, max_llvmlite_version),
387-
'numpy >={}'.format(min_numpy_run_version),
389+
'numpy >={},<{}'.format(min_numpy_run_version, max_numpy_run_version),
388390
]
389391

390392
metadata = dict(

0 commit comments

Comments
 (0)