From 2efb71e12f96e3de404beaab929c0e90e787db69 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Sep 2024 20:27:38 -0500 Subject: [PATCH] loosen pin, remove testing-only changes --- .github/workflows/pr.yaml | 54 +++++++++---------- ci/build_python.sh | 2 - ci/build_wheel.sh | 2 - ci/test_notebooks.sh | 1 - ci/test_python.sh | 1 - ci/test_wheel.sh | 2 - .../all_cuda-118_arch-x86_64.yaml | 2 +- .../all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cuxfilter/meta.yaml | 2 +- dependencies.yaml | 2 +- python/pyproject.toml | 2 +- 11 files changed, 32 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ee55f123..05ee9412 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,20 +12,20 @@ concurrency: jobs: pr-builder: needs: - # - checks + - checks - conda-python-build - conda-python-tests - conda-notebook-tests - # - docs-build + - docs-build - wheel-build - # - wheel-tests + - wheel-tests secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - # checks: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 + checks: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 conda-python-build: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: @@ -47,18 +47,18 @@ jobs: arch: "amd64" container_image: "rapidsai/ci-conda:latest" run_script: "ci/test_notebooks.sh" - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" wheel-build: - # needs: checks + needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: @@ -66,12 +66,12 @@ jobs: script: ci/build_wheel.sh # This selects "ARCH=amd64 + the latest supported Python + CUDA". matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))])) - # wheel-tests: - # needs: wheel-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: ci/test_wheel.sh - # # This selects "ARCH=amd64 + the latest supported Python + CUDA". - # matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.] + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + with: + build_type: pull-request + script: ci/test_wheel.sh + # This selects "ARCH=amd64 + the latest supported Python + CUDA". + matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.] diff --git a/ci/build_python.sh b/ci/build_python.sh index 1c1d7747..9c0bbc83 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -9,8 +9,6 @@ source rapids-configure-sccache source rapids-date-string -source ./ci/use_conda_packages_from_prs.sh - rapids-print-env rapids-generate-version > ./VERSION diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 87595e0f..78e2bed2 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -13,8 +13,6 @@ rapids-generate-version > ./VERSION RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -source ./ci/use_wheels_from_prs.sh - cd "${package_dir}" python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 389c63c6..730129f0 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -4,7 +4,6 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh -source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generate notebook testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_python.sh b/ci/test_python.sh index 94314ca2..0e7c1f20 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -4,7 +4,6 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh -source ./ci/use_conda_packages_from_prs.sh rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 2b775ff4..c1253fe9 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -6,8 +6,6 @@ set -eou pipefail RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="cuxfilter_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist -source ./ci/use_wheels_from_prs.sh - # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/cuxfilter*.whl)[test] diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 1490d6ea..7d438be2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -28,7 +28,7 @@ dependencies: - nodejs>=18 - notebook>=0.5.0 - numba>=0.57 -- numpy>=2.0,<3.0a0 +- numpy>=1.23,<3.0a0 - numpydoc - packaging - pandoc<=2.0.0 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index c72c9caf..7b55e96f 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -27,7 +27,7 @@ dependencies: - nodejs>=18 - notebook>=0.5.0 - numba>=0.57 -- numpy>=2.0,<3.0a0 +- numpy>=1.23,<3.0a0 - numpydoc - packaging - pandoc<=2.0.0 diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index e3b0c86a..36740515 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -37,7 +37,7 @@ requirements: - libwebp-base - nodejs >=14 - numba >=0.57 - - numpy >=2.0,<3.0a0 + - numpy >=1.23,<3.0a0 - packaging - panel >=1.0 - python diff --git a/dependencies.yaml b/dependencies.yaml index e03dce37..03906853 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -196,7 +196,7 @@ dependencies: - holoviews>=1.16.0 - jupyter-server-proxy - numba>=0.57 - - numpy>=2.0,<3.0a0 + - numpy>=1.23,<3.0a0 - packaging - panel>=1.0 - output_types: conda diff --git a/python/pyproject.toml b/python/pyproject.toml index d9ab288c..bb780ba5 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "holoviews>=1.16.0", "jupyter-server-proxy", "numba>=0.57", - "numpy>=2.0,<3.0a0", + "numpy>=1.23,<3.0a0", "packaging", "panel>=1.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.