From 76b3b160f36c45b17077567fdfc040a91f9eed76 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 30 Jun 2023 10:26:50 -0500 Subject: [PATCH 1/4] [ci] increase valgrind timeout to 5 hours --- .github/workflows/r_valgrind.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r_valgrind.yml b/.github/workflows/r_valgrind.yml index 37fe2b0d5185..d00611e4f128 100644 --- a/.github/workflows/r_valgrind.yml +++ b/.github/workflows/r_valgrind.yml @@ -7,7 +7,7 @@ on: jobs: test-r-valgrind: name: r-package (ubuntu-latest, R-devel, valgrind) - timeout-minutes: 300 + timeout-minutes: 360 runs-on: ubuntu-latest container: wch1/r-debug env: From 69a728acff4b3bbc8726e5f8e1307c608b100beb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 1 Jul 2023 20:48:12 -0500 Subject: [PATCH 2/4] put a ceiling on scikit-learn in docs environment --- docs/env.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index 69bcd92fbdc3..fb646ef3f499 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -13,6 +13,8 @@ dependencies: - r-pkgdown=1.6.1 - r-rmarkdown=2.11 - r-roxygen2=7.2.1 - - scikit-learn + # scikit-learn pin can hopefully be changed to a floor after + # https://github.com/scikit-learn/scikit-learn/pull/26747 + - scikit-learn<1.3.0 - sphinx - "sphinx_rtd_theme>=0.5" From a84d4684670251ea4a80371a8706d973e0b0e139 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 3 Jul 2023 22:10:40 -0500 Subject: [PATCH 3/4] revert scikit-learn pin --- docs/env.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/env.yml b/docs/env.yml index fb646ef3f499..e9d5fdf2e4a8 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -1,4 +1,4 @@ -name: docs-env +iname: docs-env channels: - nodefaults - conda-forge @@ -13,8 +13,6 @@ dependencies: - r-pkgdown=1.6.1 - r-rmarkdown=2.11 - r-roxygen2=7.2.1 - # scikit-learn pin can hopefully be changed to a floor after - # https://github.com/scikit-learn/scikit-learn/pull/26747 - - scikit-learn<1.3.0 + - scikit-learn - sphinx - "sphinx_rtd_theme>=0.5" From 18ce7e6babfd17b50eaccc96064ca3b8e1431eb1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 3 Jul 2023 22:18:11 -0500 Subject: [PATCH 4/4] Update docs/env.yml --- docs/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index e9d5fdf2e4a8..69bcd92fbdc3 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -1,4 +1,4 @@ -iname: docs-env +name: docs-env channels: - nodefaults - conda-forge