Skip to content

Commit 6d8ce6c

Browse files
authored
Revert "Workaround conda-forge/numba-feedstock#158 (#282)" (#285)
This reverts commit eaddf13.
1 parent 3a60c37 commit 6d8ce6c

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

ci/build_docs.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ rapids-mamba-retry create -n docs \
1313
sphinx \
1414
sphinx_rtd_theme \
1515
numpydoc \
16-
python=${RAPIDS_PY_VERSION} \
17-
numpy=2.2
16+
python=${RAPIDS_PY_VERSION}
1817

1918
# Temporarily allow unbound variables for conda activation.
2019
set +u

ci/test_conda.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@ set -euo pipefail
77

88
if [ "${CUDA_VER%.*.*}" = "11" ]; then
99
CTK_PACKAGES="cudatoolkit=11"
10-
# 11.8 Packages test with Python 3.9 and 3.10, so use a NumPy that is
11-
# available for those Python versions
12-
NUMPY_VERSION=2.0
1310
else
1411
CTK_PACKAGES="cuda-cccl cuda-nvcc-impl cuda-nvrtc libcurand-dev"
1512
apt-get update
1613
apt remove --purge `dpkg --get-selections | grep cuda-nvvm | awk '{print $1}'` -y
1714
apt remove --purge `dpkg --get-selections | grep cuda-nvrtc | awk '{print $1}'` -y
18-
# Use the latest supported NumPy
19-
NUMPY_VERSION=2.2
2015
fi
2116

2217

@@ -33,8 +28,7 @@ rapids-mamba-retry create -n test \
3328
psutil \
3429
pytest \
3530
cffi \
36-
python=${RAPIDS_PY_VERSION} \
37-
numpy=${NUMPY_VERSION}
31+
python=${RAPIDS_PY_VERSION}
3832

3933
# Temporarily allow unbound variables for conda activation.
4034
set +u

ci/test_conda_pynvjitlink.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ rapids-mamba-retry create -n test \
2323
psutil \
2424
pytest \
2525
cffi \
26-
python=${RAPIDS_PY_VERSION} \
27-
numpy=2.2
26+
python=${RAPIDS_PY_VERSION}
2827

2928
# Temporarily allow unbound variables for conda activation.
3029
set +u

ci/test_simulator.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ rapids-mamba-retry create -n test \
1111
psutil \
1212
pytest \
1313
cffi \
14-
python=${RAPIDS_PY_VERSION} \
15-
numpy=2.2
14+
python=${RAPIDS_PY_VERSION}
1615

1716
# Temporarily allow unbound variables for conda activation.
1817
set +u

0 commit comments

Comments
 (0)