From dc14ad291b323ae76d0db8d5b6fec35498add9bc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 22:21:12 -0600 Subject: [PATCH 1/6] [ci] [docs] update some docs and CI dependencies --- .ci/test.sh | 10 +++++----- docs/env.yml | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index 1df7d53205fd..a1a97e466c29 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -72,9 +72,9 @@ if [[ $TASK == "lint" ]]; then cd ${BUILD_DIRECTORY} mamba create -q -y -n $CONDA_ENV \ ${CONDA_PYTHON_REQUIREMENT} \ - cmakelint \ - cpplint \ - mypy \ + 'cmakelint>=1.4.2' \ + 'cpplint>=1.6.0' \ + 'mypy>=1.8.0' \ 'pre-commit>=3.6.0' \ 'pyarrow>=14.0' \ 'r-lintr>=3.1' @@ -97,8 +97,8 @@ if [[ $TASK == "check-docs" ]] || [[ $TASK == "check-links" ]]; then -q \ -y \ -n $CONDA_ENV \ - doxygen \ - 'rstcheck>=6.0.0' || exit 1 + 'doxygen>=1.10.0' \ + 'rstcheck>=6.2.0' || exit 1 source activate $CONDA_ENV # check reStructuredText formatting cd $BUILD_DIRECTORY/python-package diff --git a/docs/env.yml b/docs/env.yml index 351ce1f0fae0..28ef2c5021b8 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -3,16 +3,16 @@ channels: - nodefaults - conda-forge dependencies: - - breathe - - python=3.9 - - r-base=4.1.3 - - r-data.table=1.14.2 - - r-jsonlite=1.7.2 - - r-knitr=1.37 - - r-markdown - - r-matrix=1.4_0 - - r-pkgdown=1.6.1 - - r-roxygen2=7.2.1 - - scikit-learn - - sphinx - - "sphinx_rtd_theme>=0.5" + - breathe=4.35 + - python=3.11 + - r-base=4.3.2 + - r-data.table=1.14.10 + - r-jsonlite=1.8.8 + - r-knitr=1.45 + - r-markdown=1.12 + - r-matrix=1.6_4 + - r-pkgdown=2.0.7 + - r-roxygen2=7.3.1 + - scikit-learn>=1.4.0 + - sphinx=7.2.6 + - sphinx_rtd_theme=2.0 From 22568dcf2f44e9b8428671dcc5fe8874d47422e6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 22:34:01 -0600 Subject: [PATCH 2/6] remove pin on breathe --- docs/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index 28ef2c5021b8..7e9b3870a3df 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -3,7 +3,7 @@ channels: - nodefaults - conda-forge dependencies: - - breathe=4.35 + - breathe - python=3.11 - r-base=4.3.2 - r-data.table=1.14.10 From 4ee176ef50d11200b861cda0519e072a023fa4b9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 22:59:44 -0600 Subject: [PATCH 3/6] loosen constraints a bit --- docs/env.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/env.yml b/docs/env.yml index 7e9b3870a3df..e20da1362961 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -14,5 +14,5 @@ dependencies: - r-pkgdown=2.0.7 - r-roxygen2=7.3.1 - scikit-learn>=1.4.0 - - sphinx=7.2.6 - - sphinx_rtd_theme=2.0 + - sphinx>=7.0 + - sphinx_rtd_theme>=2.0 From 21b33defe7c971f88784fd995bad1ef2885089cc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 29 Feb 2024 20:08:37 -0600 Subject: [PATCH 4/6] newer breathe --- docs/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index e20da1362961..23721aa7e48a 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -3,7 +3,7 @@ channels: - nodefaults - conda-forge dependencies: - - breathe + - breathe>=4.35 - python=3.11 - r-base=4.3.2 - r-data.table=1.14.10 From fcfa0bc47645061b524d2ba73ca4b151defbf444 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 3 Mar 2024 15:40:08 -0600 Subject: [PATCH 5/6] try Python 3.10 --- docs/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index 23721aa7e48a..2072b6bf7d57 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - breathe>=4.35 - - python=3.11 + - python=3.10 - r-base=4.3.2 - r-data.table=1.14.10 - r-jsonlite=1.8.8 From 3f0fb819d47f2b7511889782b7ab7814434f6e82 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 3 Mar 2024 17:38:52 -0600 Subject: [PATCH 6/6] let sphinx fall back to 6.0 because breathe has a ceiling --- docs/env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env.yml b/docs/env.yml index 2072b6bf7d57..a532316ef85d 100644 --- a/docs/env.yml +++ b/docs/env.yml @@ -14,5 +14,5 @@ dependencies: - r-pkgdown=2.0.7 - r-roxygen2=7.3.1 - scikit-learn>=1.4.0 - - sphinx>=7.0 + - sphinx>=6.0 - sphinx_rtd_theme>=2.0