From 233ced038b9255bc296b4c1c9b258a9c3de18df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 28 Nov 2024 09:53:04 +0100 Subject: [PATCH 1/4] CI Fix rendered doc affected paths for towncrier fragments --- build_tools/circle/build_doc.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 30a0d3fc8a9b5..8c62324c622be 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -209,9 +209,14 @@ cd - set +o pipefail affected_doc_paths() { + scikit_learn_version=$(python -c 'import re; import sklearn; print(re.sub(r"(\d+\.\d+).+", r"\1", sklearn.__version__))') files=$(git diff --name-only origin/main...$CIRCLE_SHA1) # use sed to replace files ending by .rst or .rst.template by .html - echo "$files" | grep ^doc/.*\.rst | sed 's/^doc\/\(.*\)\.rst$/\1.html/; s/^doc\/\(.*\)\.rst\.template$/\1.html/' + echo "$files" | grep -vP 'upcoming_changes/.*/\d+.*\.rst' | grep ^doc/.*\.rst | \ + sed 's/^doc\/\(.*\)\.rst$/\1.html/; s/^doc\/\(.*\)\.rst\.template$/\1.html/' + # replace towncrier fragment files by link to changelog + echo "$files" | grep -P 'upcoming_changes/.*/\d+.*\.rst' | sed "s@.*@whats_new/v${scikit_learn_version}.html@" + echo "$files" | grep ^examples/.*.py | sed 's/^\(.*\)\.py$/auto_\1.html/' sklearn_files=$(echo "$files" | grep '^sklearn/') if [ -n "$sklearn_files" ] From c1c26a738fe8d20fcfc6c4a41c88b9782ac7cdcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 28 Nov 2024 09:54:23 +0100 Subject: [PATCH 2/4] CI Fix rendered doc affected paths for towncrier fragments --- build_tools/circle/build_doc.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 8c62324c622be..2ff0e55b31d55 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -214,8 +214,10 @@ affected_doc_paths() { # use sed to replace files ending by .rst or .rst.template by .html echo "$files" | grep -vP 'upcoming_changes/.*/\d+.*\.rst' | grep ^doc/.*\.rst | \ sed 's/^doc\/\(.*\)\.rst$/\1.html/; s/^doc\/\(.*\)\.rst\.template$/\1.html/' - # replace towncrier fragment files by link to changelog - echo "$files" | grep -P 'upcoming_changes/.*/\d+.*\.rst' | sed "s@.*@whats_new/v${scikit_learn_version}.html@" + # replace towncrier fragment files by link to changelog. uniq is used + # because in some edge cases multiple fragments can be added and we want a + # single link to the changelog. + echo "$files" | grep -P 'upcoming_changes/.*/\d+.*\.rst' | sed "s@.*@whats_new/v${scikit_learn_version}.html@" | uniq echo "$files" | grep ^examples/.*.py | sed 's/^\(.*\)\.py$/auto_\1.html/' sklearn_files=$(echo "$files" | grep '^sklearn/') From 6ed87abff13eb0928bb47760d523f871ab2a2f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 28 Nov 2024 09:59:44 +0100 Subject: [PATCH 3/4] quick test with a changelog and a doc change --- doc/modules/linear_model.rst | 2 ++ doc/whats_new/upcoming_changes/array-api/30361.api.rst | 1 + doc/whats_new/upcoming_changes/array-api/30361.fix.rst | 1 + 3 files changed, 4 insertions(+) create mode 100644 doc/whats_new/upcoming_changes/array-api/30361.api.rst create mode 100644 doc/whats_new/upcoming_changes/array-api/30361.fix.rst diff --git a/doc/modules/linear_model.rst b/doc/modules/linear_model.rst index 01920325341cb..2408173ef4756 100644 --- a/doc/modules/linear_model.rst +++ b/doc/modules/linear_model.rst @@ -4,6 +4,8 @@ Linear Models ============= +I am changing this to see whether affected paths is correct + .. currentmodule:: sklearn.linear_model The following are a set of methods intended for regression in which diff --git a/doc/whats_new/upcoming_changes/array-api/30361.api.rst b/doc/whats_new/upcoming_changes/array-api/30361.api.rst new file mode 100644 index 0000000000000..357153de2e276 --- /dev/null +++ b/doc/whats_new/upcoming_changes/array-api/30361.api.rst @@ -0,0 +1 @@ +- api change diff --git a/doc/whats_new/upcoming_changes/array-api/30361.fix.rst b/doc/whats_new/upcoming_changes/array-api/30361.fix.rst new file mode 100644 index 0000000000000..8b238e26551bc --- /dev/null +++ b/doc/whats_new/upcoming_changes/array-api/30361.fix.rst @@ -0,0 +1 @@ +- fix From 6bbce97801d670b94672c8793362b8254ece171c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 28 Nov 2024 10:30:33 +0100 Subject: [PATCH 4/4] Revert "quick test with a changelog and a doc change" [azure parallel] This reverts commit 6ed87abff13eb0928bb47760d523f871ab2a2f0f. --- doc/modules/linear_model.rst | 2 -- doc/whats_new/upcoming_changes/array-api/30361.api.rst | 1 - doc/whats_new/upcoming_changes/array-api/30361.fix.rst | 1 - 3 files changed, 4 deletions(-) delete mode 100644 doc/whats_new/upcoming_changes/array-api/30361.api.rst delete mode 100644 doc/whats_new/upcoming_changes/array-api/30361.fix.rst diff --git a/doc/modules/linear_model.rst b/doc/modules/linear_model.rst index 2408173ef4756..01920325341cb 100644 --- a/doc/modules/linear_model.rst +++ b/doc/modules/linear_model.rst @@ -4,8 +4,6 @@ Linear Models ============= -I am changing this to see whether affected paths is correct - .. currentmodule:: sklearn.linear_model The following are a set of methods intended for regression in which diff --git a/doc/whats_new/upcoming_changes/array-api/30361.api.rst b/doc/whats_new/upcoming_changes/array-api/30361.api.rst deleted file mode 100644 index 357153de2e276..0000000000000 --- a/doc/whats_new/upcoming_changes/array-api/30361.api.rst +++ /dev/null @@ -1 +0,0 @@ -- api change diff --git a/doc/whats_new/upcoming_changes/array-api/30361.fix.rst b/doc/whats_new/upcoming_changes/array-api/30361.fix.rst deleted file mode 100644 index 8b238e26551bc..0000000000000 --- a/doc/whats_new/upcoming_changes/array-api/30361.fix.rst +++ /dev/null @@ -1 +0,0 @@ -- fix