From 98abe003710b98a8d8b205da21431529a62b73c0 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 09:45:49 -0800 Subject: [PATCH 01/15] add dependencies for docs generation --- conda/environments/all_cuda-115_arch-x86_64.yaml | 8 ++++++++ dependencies.yaml | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index f5ed5e8a1c..3ccedc4000 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -25,6 +25,8 @@ dependencies: - gcc_linux-64=9.* - hdbscan - hypothesis>=6.0,<7 +- ipykernel +- ipython - joblib>=0.11 - libcublas-dev>=11.7.3.1,<=11.7.4.6 - libcublas>=11.7.3.1,<=11.7.4.6 @@ -41,10 +43,12 @@ dependencies: - libraft-distance=23.02.* - libraft-headers=23.02.* - libraft-nn=23.02.* +- nbsphinx - ninja - nltk - numpydoc - pip +- pydata-sphinx-theme - pylibraft=23.02.* - pytest - pytest-cases @@ -52,11 +56,15 @@ dependencies: - pytest-xdist - python>=3.8,<3.10 - raft-dask=23.02.* +- recommonmark - rmm=23.02.* - scikit-build>=0.13.1 - scikit-learn=0.24 - seaborn +- sklearn - sparse +- sphinx +- sphinx-copybutton - sphinx-markdown-tables - statsmodels - sysroot_linux-64==2.17 diff --git a/dependencies.yaml b/dependencies.yaml index 8bf42f9536..7fd4c16771 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -180,6 +180,15 @@ dependencies: common: - output_types: [conda, requirements] packages: + - ipython + - ipykernel + - nbsphinx + - numpydoc + - pydata-sphinx-theme + - recommonmark + - sklearn + - sphinx + - sphinx-copybutton - sphinx-markdown-tables - output_types: conda packages: From bfe0817b8ac02f47fbf1ac2d971460c99cdb1656 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 11:02:34 -0800 Subject: [PATCH 02/15] update cppdocs generation file with static values instead of CMAKE vars --- ci/release/update-version.sh | 3 +++ cpp/Doxyfile.in | 24 ++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index dca5b31dd2..3768cc0012 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -41,6 +41,9 @@ sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cma sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py +# Update project_number (RAPIDS_VERSION) in the CPP doxygen file +sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '"'${NEXT_SHORT_TAG}'"'/g' Doxyfile.in + for FILE in dependencies.yaml conda/environments/*.yaml; do sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE}; sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE}; diff --git a/cpp/Doxyfile.in b/cpp/Doxyfile.in index 14d0f6fbb5..09fbac37c0 100644 --- a/cpp/Doxyfile.in +++ b/cpp/Doxyfile.in @@ -38,7 +38,7 @@ PROJECT_NAME = "cuML C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = @CUML_VERSION@ +PROJECT_NUMBER = '23.02' # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@ +OUTPUT_DIRECTORY = # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -737,7 +737,7 @@ WARN_NO_PARAMDOC = YES # a warning is encountered. # The default value is: NO. -WARN_AS_ERROR = YES +WARN_AS_ERROR = NO # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which @@ -765,9 +765,9 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = @CMAKE_CURRENT_SOURCE_DIR@/include \ - @CMAKE_CURRENT_SOURCE_DIR@/src \ - @CMAKE_CURRENT_SOURCE_DIR@/src_prims +INPUT = include \ + src \ + src_prims # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -866,11 +866,7 @@ EXAMPLE_RECURSIVE = NO # that contain images that are to be included in the documentation (see the # \image command). -# IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/doxygen/images - -# temporarily using cmake_current_source_dir for image path since we don't have images, -# comment the above whenever images are needed in the doxygen/images folder -IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/ +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -1082,7 +1078,7 @@ HTML_FILE_EXTENSION = .html # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = @CMAKE_CURRENT_SOURCE_DIR@/header.html +HTML_HEADER = header.html # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -2126,7 +2122,7 @@ HIDE_UNDOC_RELATIONS = YES # set to NO # The default value is: YES. -HAVE_DOT = @DOXYGEN_DOT_FOUND@ +HAVE_DOT = YES # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed # to run in parallel. When set to 0 doxygen will base this on the number of @@ -2306,7 +2302,7 @@ INTERACTIVE_SVG = NO # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = @DOXYGEN_DOT_EXECUTABLE@ +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile From 9f6f0a3ecb7b16ad49506d84ee43f8e28076c91e Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 11:11:44 -0800 Subject: [PATCH 03/15] doc -> docs for consistency across repos --- conda/environments/all_cuda-115_arch-x86_64.yaml | 1 - dependencies.yaml | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 3ccedc4000..5932f70679 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -61,7 +61,6 @@ dependencies: - scikit-build>=0.13.1 - scikit-learn=0.24 - seaborn -- sklearn - sparse - sphinx - sphinx-copybutton diff --git a/dependencies.yaml b/dependencies.yaml index 7fd4c16771..eb9e3f67e7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -9,7 +9,7 @@ files: - common_build - cpp_run - cudatoolkit - - doc + - docs - py_build - py_run - py_version @@ -28,6 +28,12 @@ files: includes: - checks - py_version + docs: + output: none + includes: + - cudatoolkit + - docs + - py_version test_cpp: output: none includes: @@ -176,7 +182,7 @@ dependencies: - *libcusolver114 - *libcusparse_dev114 - *libcusparse114 - doc: + docs: common: - output_types: [conda, requirements] packages: @@ -186,7 +192,7 @@ dependencies: - numpydoc - pydata-sphinx-theme - recommonmark - - sklearn + - scikit-learn=0.24 - sphinx - sphinx-copybutton - sphinx-markdown-tables From 2bfbf1525de3a338623ee17cdeed2b90a19c306c Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 11:16:16 -0800 Subject: [PATCH 04/15] add docs-build GH commands --- .github/workflows/build.yaml | 11 +++++++++++ .github/workflows/pr.yaml | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0225cac8a3..5e1de091c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,6 +34,17 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + docs-build: + if: ${{ startsWith(github.ref, 'refs/heads/branch-') }} + needs: [python-build] + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + with: + build_type: branch + node_type: "gpu-latest-1" + arch: "amd64" + container_image: "rapidsai/ci:latest" + run_script: "ci/build_docs.sh" python-build: needs: [cpp-build] secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 742e7dc07a..e8e145e6ea 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -68,6 +68,16 @@ jobs: arch: "amd64" container_image: "rapidsai/ci:latest" run_script: "ci/test_notebooks.sh" + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + with: + build_type: pull-request + node_type: "gpu-latest-1" + arch: "amd64" + container_image: "rapidsai/ci:latest" + run_script: "ci/build_docs.sh" wheel-build-cuml: needs: checks secrets: inherit From d01cebad436fd56654b0dbe0cf1f903b45914082 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 11:21:26 -0800 Subject: [PATCH 05/15] add build_docs script --- ci/build_docs.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 ci/build_docs.sh diff --git a/ci/build_docs.sh b/ci/build_docs.sh new file mode 100755 index 0000000000..682c7ccc98 --- /dev/null +++ b/ci/build_docs.sh @@ -0,0 +1,46 @@ +#!/bin/bash +set -euo pipefail + +rapids-logger "Create test conda environment" +. /opt/conda/etc/profile.d/conda.sh + +rapids-dependency-file-generator \ + --output conda \ + --file_key docs \ + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml + +rapids-mamba-retry env create --force -f env.yaml -n docs +conda activate docs + +rapids-print-env + +rapids-logger "Downloading artifacts from previous jobs" + +CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +VERSION_NUMBER=$(rapids-get-rapids-version-from-git) + +rapids-mamba-retry install \ + --channel "${CPP_CHANNEL}" \ + --channel "${PYTHON_CHANNEL}" \ + cuml libcuml + +# # Build CPP docs +rapids-logger "Build cpp docs" +pushd cpp +doxygen Doxyfile.in +popd + +# Build Python docs +rapids-logger "Build Python docs" +pushd docs +sphinx-build -b dirhtml ./source _html +sphinx-build -b text ./source _text +popd + +if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then + rapids-logger "Upload Docs to S3" + aws s3 sync --no-progress --delete cpp/html "s3://rapidsai-docs/libcuml/${VERSION_NUMBER}/html" + aws s3 sync --no-progress --delete python/docs/_html "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/html" + aws s3 sync --no-progress --delete python/docs/_text "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/txt" +fi From 25ea5372fbd6ec6552ed7029513a22a9a74f0f36 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 14:05:30 -0800 Subject: [PATCH 06/15] fix versions --- ci/build_docs.sh | 4 ++-- conda/environments/all_cuda-115_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 682c7ccc98..64787d3b08 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -41,6 +41,6 @@ popd if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then rapids-logger "Upload Docs to S3" aws s3 sync --no-progress --delete cpp/html "s3://rapidsai-docs/libcuml/${VERSION_NUMBER}/html" - aws s3 sync --no-progress --delete python/docs/_html "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/html" - aws s3 sync --no-progress --delete python/docs/_text "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/txt" + aws s3 sync --no-progress --delete docs/_html "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/html" + aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/cuml/${VERSION_NUMBER}/txt" fi diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 5932f70679..a89497a60e 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -62,9 +62,9 @@ dependencies: - scikit-learn=0.24 - seaborn - sparse -- sphinx - sphinx-copybutton - sphinx-markdown-tables +- sphinx<6 - statsmodels - sysroot_linux-64==2.17 - treelite=3.0.1 diff --git a/dependencies.yaml b/dependencies.yaml index eb9e3f67e7..f26a32c56d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -193,7 +193,7 @@ dependencies: - pydata-sphinx-theme - recommonmark - scikit-learn=0.24 - - sphinx + - sphinx<6 - sphinx-copybutton - sphinx-markdown-tables - output_types: conda From c252d42ab9edab4b2d00faaa257fde3dce2f57a2 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 14:20:33 -0800 Subject: [PATCH 07/15] add docs-build to pr-builder --- .github/workflows/pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e8e145e6ea..21d1ab2c7e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -19,6 +19,7 @@ jobs: - conda-python-tests-singlegpu - conda-python-tests-dask - conda-notebook-tests + - docs-build - wheel-build-cuml - wheel-tests-cuml secrets: inherit From 5e08c56deb99249fcb1990e7d6d9a165f936c19e Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 17:10:40 -0800 Subject: [PATCH 08/15] add missing graphviz dependency --- conda/environments/all_cuda-115_arch-x86_64.yaml | 1 + dependencies.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index a89497a60e..7cc1134328 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -23,6 +23,7 @@ dependencies: - doxygen=1.8.20 - faiss-proc=*=cuda - gcc_linux-64=9.* +- graphviz - hdbscan - hypothesis>=6.0,<7 - ipykernel diff --git a/dependencies.yaml b/dependencies.yaml index f26a32c56d..aaf9361521 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -186,6 +186,7 @@ dependencies: common: - output_types: [conda, requirements] packages: + - graphviz - ipython - ipykernel - nbsphinx From 1a13368b688b343d7a8f34ad1c5a0fe59024fc12 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 17:38:05 -0800 Subject: [PATCH 09/15] fix conf.py for pydocs build --- docs/source/conf.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 710402bd95..eaae92dec3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -24,7 +24,6 @@ # is relative to the documentation root, use os.path.abspath to make it # absolute, like shown here. sys.path.insert(0, os.path.abspath('sphinxext')) -sys.path.insert(0, os.path.abspath('../../python')) from github_link import make_linkcode_resolve # noqa @@ -179,8 +178,8 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - "python": ('https://docs.python.org/', None), - "scipy": ('https://docs.scipy.org/doc/scipy/reference', None) + "python": ("https://docs.python.org/3", None), + "scipy": ("https://docs.scipy.org/doc/scipy", None), } # Config numpydoc From f03f176781ef8a36de7647cbaf5cf6ec4932fc77 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Tue, 24 Jan 2023 17:38:22 -0800 Subject: [PATCH 10/15] add -W flag to pydocs build --- ci/build_docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 64787d3b08..c56b4b7134 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -34,8 +34,8 @@ popd # Build Python docs rapids-logger "Build Python docs" pushd docs -sphinx-build -b dirhtml ./source _html -sphinx-build -b text ./source _text +sphinx-build -b dirhtml ./source _html -W +sphinx-build -b text ./source _text -W popd if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then From 86ec41cc5e31d759cbcf68d164bc8fdada755555 Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 25 Jan 2023 13:58:39 -0800 Subject: [PATCH 11/15] turn WARN_AS_ERROR back on Co-authored-by: AJ Schmidt --- cpp/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Doxyfile.in b/cpp/Doxyfile.in index 09fbac37c0..7b61086873 100644 --- a/cpp/Doxyfile.in +++ b/cpp/Doxyfile.in @@ -737,7 +737,7 @@ WARN_NO_PARAMDOC = YES # a warning is encountered. # The default value is: NO. -WARN_AS_ERROR = NO +WARN_AS_ERROR = YES # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which From 9e9f170535444570f187f41d95dd1b573665bddd Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Wed, 25 Jan 2023 14:08:28 -0800 Subject: [PATCH 12/15] add core_dists documentation to avoid docs warning --- cpp/include/cuml/cluster/hdbscan.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/include/cuml/cluster/hdbscan.hpp b/cpp/include/cuml/cluster/hdbscan.hpp index 3df1b6887c..caf4132784 100644 --- a/cpp/include/cuml/cluster/hdbscan.hpp +++ b/cpp/include/cuml/cluster/hdbscan.hpp @@ -419,6 +419,7 @@ void generate_prediction_data(const raft::handle_t& handle, * @param metric distance metric to use * @param params struct of configuration hyper-parameters * @param out struct of output data and arrays on device + * @param core_dists array (size m, 1) of core distances */ void hdbscan(const raft::handle_t& handle, const float* X, From a31f1849b621cffa272cc94b481e1ee522a4729c Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 25 Jan 2023 17:28:20 -0500 Subject: [PATCH 13/15] update `sed` command & associated file path --- ci/release/update-version.sh | 2 +- cpp/Doxyfile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 3768cc0012..0ad0771ff2 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -42,7 +42,7 @@ sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py # Update project_number (RAPIDS_VERSION) in the CPP doxygen file -sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '"'${NEXT_SHORT_TAG}'"'/g' Doxyfile.in +sed_runner "s/\(PROJECT_NUMBER.*=\).*/\1 \"${NEXT_SHORT_TAG}\"/g" cpp/Doxyfile.in for FILE in dependencies.yaml conda/environments/*.yaml; do sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE}; diff --git a/cpp/Doxyfile.in b/cpp/Doxyfile.in index 7b61086873..a6827639a0 100644 --- a/cpp/Doxyfile.in +++ b/cpp/Doxyfile.in @@ -38,7 +38,7 @@ PROJECT_NAME = "cuML C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = '23.02' +PROJECT_NUMBER = "23.02" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 5a396fda583c0af15bf580afe8df106fb8fbce39 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 25 Jan 2023 17:29:43 -0500 Subject: [PATCH 14/15] fix unrelated sed command --- ci/release/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 0ad0771ff2..2a71708a0c 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -60,7 +60,7 @@ for FILE in dependencies.yaml conda/environments/*.yaml; do sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE}; done -sed_runner "s|/branch-.*/|/branch-${NEXT_SHORT_TAG}/|g" python/README.md +sed_runner "s|/branch-.*?/|/branch-${NEXT_SHORT_TAG}/|g" python/README.md # Wheel builds clone cumlprims_mg, update its branch sed_runner "s/extra-repo-sha: branch-.*/extra-repo-sha: branch-${NEXT_SHORT_TAG}/g" .github/workflows/*.yaml From 65de9b4e7d01817f604023b774eb186d072accf7 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 26 Jan 2023 16:54:55 -0500 Subject: [PATCH 15/15] fix scikit-learn pinnings --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8c190bc5d3..ebc2e49729 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -193,7 +193,7 @@ dependencies: - numpydoc - pydata-sphinx-theme - recommonmark - - scikit-learn=0.24 + - &scikit_learn scikit-learn=1.2 - sphinx<6 - sphinx-copybutton - sphinx-markdown-tables @@ -229,7 +229,7 @@ dependencies: - pytest-cases - pytest-cov - pytest-xdist - - &scikit_learn scikit-learn=1.2 + - *scikit_learn - seaborn - sparse - statsmodels