diff --git a/ci/axis/nightly-env-arm64.yaml b/ci/axis/nightly-env-arm64.yaml index 0dfae40c..f39cc044 100644 --- a/ci/axis/nightly-env-arm64.yaml +++ b/ci/axis/nightly-env-arm64.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 22.02.00a + - 22.04.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/nightly-env.yaml b/ci/axis/nightly-env.yaml index 0dfae40c..f39cc044 100644 --- a/ci/axis/nightly-env.yaml +++ b/ci/axis/nightly-env.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 22.02.00a + - 22.04.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/nightly-meta-arm64.yaml b/ci/axis/nightly-meta-arm64.yaml index 0dfae40c..f39cc044 100644 --- a/ci/axis/nightly-meta-arm64.yaml +++ b/ci/axis/nightly-meta-arm64.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 22.02.00a + - 22.04.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/nightly-meta.yaml b/ci/axis/nightly-meta.yaml index 0dfae40c..f39cc044 100644 --- a/ci/axis/nightly-meta.yaml +++ b/ci/axis/nightly-meta.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Ya (major.minor.patch) with 'a' version to match nightly tag RAPIDS_VER: - - 22.02.00a + - 22.04.00a # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/release-arm64.yaml b/ci/axis/release-arm64.yaml index 7ef29118..06d56d31 100644 --- a/ci/axis/release-arm64.yaml +++ b/ci/axis/release-arm64.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - "22.02.00" + - "22.04.00" # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/release.yaml b/ci/axis/release.yaml index 7ef29118..06d56d31 100644 --- a/ci/axis/release.yaml +++ b/ci/axis/release.yaml @@ -6,7 +6,7 @@ CONDA_CONFIG_FILE: # Use M.X.Y (major.minor.patch) version to match tag RAPIDS_VER: - - "22.02.00" + - "22.04.00" # Use CUDA_VER to not clobber `CUDA_VERSION` in the container CUDA_VER: diff --git a/ci/axis/tests.yaml b/ci/axis/tests.yaml index 92e31f2b..f52cba6f 100644 --- a/ci/axis/tests.yaml +++ b/ci/axis/tests.yaml @@ -6,7 +6,7 @@ DOCKER_REPO: # Use M.X (major.minor) version RAPIDS_VER: - - "22.02" + - "22.04" CUDA_VER: - 11.5 diff --git a/conda/recipes/rapids-build-env/meta.yaml b/conda/recipes/rapids-build-env/meta.yaml index ed86737f..71c32457 100644 --- a/conda/recipes/rapids-build-env/meta.yaml +++ b/conda/recipes/rapids-build-env/meta.yaml @@ -43,6 +43,7 @@ requirements: - automake - benchmark {{ benchmark_version }} - black {{ black_version }} + - click =8.0.4 # Required for black < 22.3.0, see https://github.com/psf/black/issues/2964 - conda-forge::blas - boost - boost-cpp {{ boost_cpp_version }} @@ -79,6 +80,7 @@ requirements: - gmock {{ gmock_version }} - graphviz - gtest {{ gtest_version }} + - h5py - hdbscan - holoviews {{ holoviews_version }} - httpretty @@ -88,7 +90,6 @@ requirements: - libcypher-parser - libgcc-ng {{ build_stack_version }} - libgfortran-ng {{ build_stack_version }} - - libhwloc - liblapack - librdkafka {{ librdkafka_version }} - libstdcxx-ng {{ build_stack_version }} @@ -111,7 +112,6 @@ requirements: - packaging - pandas {{ pandas_version }} - panel {{ panel_version }} - - pickle5 # [py<38] - pillow {{ pillow_version }} - pkg-config - pre-commit @@ -139,6 +139,7 @@ requirements: - ripgrep - s3fs {{ s3fs_version }} - setuptools + - scikit-build {{ scikit_build_version }} - scikit-image {{ scikit_image_version }} - scikit-learn {{ scikit_learn_version }} - scipy {{ scipy_version }} diff --git a/conda/recipes/rapids-notebook-env/meta.yaml b/conda/recipes/rapids-notebook-env/meta.yaml index 9ac98d4e..630b3254 100644 --- a/conda/recipes/rapids-notebook-env/meta.yaml +++ b/conda/recipes/rapids-notebook-env/meta.yaml @@ -42,9 +42,11 @@ requirements: - cudatoolkit ={{ cuda_major }}.* - cupy {{ cupy_version }} - cython {{ cython_version }} + - dask {{ dask_version }} - dask-labextension - dask-ml - datashader {{ datashader_version }} + - distributed {{ distributed_version }} - filterpy - holoviews - ipython {{ ipython_version }} diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index 5cb3da0b..68db24f9 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -44,7 +44,6 @@ requirements: - numba {{ numba_version }} - numpy {{ numpy_version }} - nvtx {{ nvtx_version }} - - pickle5 # [py<38] - python - setuptools {{ setuptools_version }} - cudf ={{ minor_version }}.* diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 579f5706..cd54d1b4 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -21,17 +21,17 @@ conda_verify_version: # Versions for `libgcc-ng`, `libgfortran-ng`, `libstdcxx-ng` stack build_stack_version: - - '=9.4.0' + - '>=9.4.0' # Shared versions across meta-pkgs arrow_version: - - '=5.0.0' + - '=6.0.1' benchmark_version: - '=1.5.1' black_version: - '=19.10' bokeh_version: - - '>=2.3.2,<2.4' + - '>=2.4.2,<=2.5' boost_cpp_version: - '=1.72.0' clang_version: @@ -49,11 +49,11 @@ cupy_version: cython_version: - '>=0.29.17,<0.30' dask_version: - - '>=2021.11.1,<=2022.01.0' + - '=2022.03.0' datashader_version: - - '>0.12,<=0.13' + - '>0.13,<0.14' distributed_version: - - '>=2021.11.1,<=2022.01.0' + - '=2022.03.0' dlpack_version: - '>=0.5,<0.6.0a0' double_conversion_version: @@ -105,7 +105,7 @@ nbsphinx_version: nccl_version: - '>=2.9.9,<3.0a0' networkx_version: - - '>=2.5.1' + - '>=2.5.1,<=2.6.3' nlohmann_json_version: - '3.9.1' nodejs_version: @@ -123,7 +123,7 @@ pandas_version: pandoc_version: - '<=2.0.0' panel_version: - - '>=0.10.3' + - '>=0.12.7,<0.13' pillow_version: - '>=9.0.0' pydeck_version: @@ -148,10 +148,13 @@ rapidjson_version: - '=1.1.0' s3fs_version: - '>=2021.08.0' +scikit_build_version: + - '=0.13.1' scikit_image_version: - '>=0.18.0,<0.20.0' scikit_learn_version: - '=0.24' +# when scipy is updated, remove upper bound on networkx ver. scipy_version: - '=1.6.0' setuptools_version: @@ -161,6 +164,6 @@ spdlog_version: sphinx_markdown_tables_version: - '=0.0.14=pyh9f0ad1d_1' treelite_version: - - '=2.2.1' + - '=2.3.0' transformers_version: - '<=4.10.3'