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 llvmlite and NumPy on release branch #8884

Merged
merged 5 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions CHANGE_LOG
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ Pull-Requests:
* PR `#8879 <https://github.com/numba/numba/pull/8879>`_: Remove use of ``compile_isolated`` from generator tests. (`stuartarchibald <https://github.com/stuartarchibald>`_)
* PR `#8880 <https://github.com/numba/numba/pull/8880>`_: Fix missing dependency guard on pyyaml in ``test_azure_config``. (`stuartarchibald <https://github.com/stuartarchibald>`_)
* PR `#8881 <https://github.com/numba/numba/pull/8881>`_: Replace use of compile_isolated in test_obj_lifetime (`sklam <https://github.com/sklam>`_)
* PR `#8884 <https://github.com/numba/numba/pull/8884>`_: Pin llvmlite and NumPy on release branch (`sklam <https://github.com/sklam>`_)

Authors:

Expand Down
6 changes: 3 additions & 3 deletions buildscripts/condarecipe.local/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ requirements:
- setuptools
- importlib_metadata # [py<39]
# On channel https://anaconda.org/numba/
- llvmlite >=0.40.0dev0,<0.40
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manual conda build and then install + check test suite starts suggests this is ok.

- llvmlite >=0.40.0rc1,<0.41
# TBB devel version is to match TBB libs.
# NOTE: ppc64le and aarch64 are pending testing so excluded for now, win32
# is not a supported parallel target.
- tbb-devel >=2021.6 # [not (aarch64 or ppc64le or win32)]
run:
- python >=3.8
# NumPy 1.22.0, 1.22.1, 1.22.2 are all broken for ufuncs, see #7756
- numpy >=1.21, !=1.22.0, !=1.22.1, !=1.22.2
- numpy >=1.21, !=1.22.0, !=1.22.1, !=1.22.2, <1.25
- importlib_metadata # [py<39]
# On channel https://anaconda.org/numba/
- llvmlite >=0.40.0dev0,<0.40
- llvmlite >=0.40.0rc1,<0.41
run_constrained:
# If TBB is present it must be at least version 2021.6
- tbb >=2021.6 # [not (aarch64 or ppc64le or win32)]
Expand Down
3 changes: 2 additions & 1 deletion numba/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def extract_version(mod):
msg = (f"Numba needs NumPy 1.21 or greater. Got NumPy "
f"{numpy_version[0]}.{numpy_version[1]}.")
raise ImportError(msg)

elif numpy_version > (1, 24):
raise ImportError("Numba needs NumPy 1.24 or less")
try:
import scipy
except ImportError:
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.57 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.57...HEAD'
else:
target = 'origin/main..HEAD'
target = 'origin/release0.57..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.12" # exclusive
min_numpy_build_version = "1.11"
min_numpy_run_version = "1.21"
max_numpy_run_version = "1.25"
min_llvmlite_version = "0.40.0dev0"
max_llvmlite_version = "0.41"

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),
'importlib_metadata; python_version < "3.9"',
]

Expand Down