From 8931bc759740056c1ca5778d878706d830e2ac84 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Sat, 13 Jan 2024 11:51:25 +0100 Subject: [PATCH 1/4] Bump roxygen2 version --- DESCRIPTION | 2 +- NAMESPACE | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c3857e4b3..e0242e86d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -56,7 +56,7 @@ Config/Needs/development: pkgload, cli, testthat, patrick Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 Collate: 'make_linter_from_xpath.R' 'xp_utils.R' diff --git a/NAMESPACE b/NAMESPACE index 00d9ad2e0..3f4697780 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,6 +6,8 @@ if (getRversion() >= "4.0.0") { } else { importFrom(backports, R_user_dir) } + importFrom(backports, R_user_dir) + importFrom(tools, R_user_dir) S3method("[",lints) S3method(as.data.frame,lints) S3method(format,lint) @@ -171,6 +173,7 @@ export(with_id) export(xml_nodes_to_lints) export(xp_call_name) export(yoda_test_linter) +if (getRversion() >= "4.0.0") { importFrom(cyclocomp,cyclocomp) importFrom(glue,glue) importFrom(glue,glue_collapse) @@ -199,3 +202,5 @@ importFrom(xml2,xml_find_lgl) importFrom(xml2,xml_find_num) importFrom(xml2,xml_name) importFrom(xml2,xml_text) +} +} else { From ca2c47e61460f5f7bb46b8ca817298a62b1adda4 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Mon, 22 Jan 2024 15:57:46 +0100 Subject: [PATCH 2/4] use devel roxygen2 --- .github/workflows/repo-meta-tests.yaml | 2 +- DESCRIPTION | 2 +- NAMESPACE | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/repo-meta-tests.yaml b/.github/workflows/repo-meta-tests.yaml index 624f54d63..8293fdcf8 100644 --- a/.github/workflows/repo-meta-tests.yaml +++ b/.github/workflows/repo-meta-tests.yaml @@ -24,7 +24,7 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - any::roxygen2 + r-lib/roxygen2 - name: Ensure lint metadata is tested run: | diff --git a/DESCRIPTION b/DESCRIPTION index e0242e86d..5f03ba041 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -56,7 +56,7 @@ Config/Needs/development: pkgload, cli, testthat, patrick Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.0 +RoxygenNote: 7.3.0.9000 Collate: 'make_linter_from_xpath.R' 'xp_utils.R' diff --git a/NAMESPACE b/NAMESPACE index 3f4697780..00d9ad2e0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,8 +6,6 @@ if (getRversion() >= "4.0.0") { } else { importFrom(backports, R_user_dir) } - importFrom(backports, R_user_dir) - importFrom(tools, R_user_dir) S3method("[",lints) S3method(as.data.frame,lints) S3method(format,lint) @@ -173,7 +171,6 @@ export(with_id) export(xml_nodes_to_lints) export(xp_call_name) export(yoda_test_linter) -if (getRversion() >= "4.0.0") { importFrom(cyclocomp,cyclocomp) importFrom(glue,glue) importFrom(glue,glue_collapse) @@ -202,5 +199,3 @@ importFrom(xml2,xml_find_lgl) importFrom(xml2,xml_find_num) importFrom(xml2,xml_name) importFrom(xml2,xml_text) -} -} else { From a78d71e723ab8b5defa72a51f12ddccb4f791b66 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Wed, 24 Jan 2024 08:58:58 +0100 Subject: [PATCH 3/4] use CRAN version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5f03ba041..3bf5b9a15 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -56,7 +56,7 @@ Config/Needs/development: pkgload, cli, testthat, patrick Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.0.9000 +RoxygenNote: 7.3.1 Collate: 'make_linter_from_xpath.R' 'xp_utils.R' From c32de68ca16311418637ead91f52f8badec189d7 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Wed, 24 Jan 2024 19:03:37 -0800 Subject: [PATCH 4/4] restore any:: --- .github/workflows/repo-meta-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repo-meta-tests.yaml b/.github/workflows/repo-meta-tests.yaml index 8293fdcf8..624f54d63 100644 --- a/.github/workflows/repo-meta-tests.yaml +++ b/.github/workflows/repo-meta-tests.yaml @@ -24,7 +24,7 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - r-lib/roxygen2 + any::roxygen2 - name: Ensure lint metadata is tested run: |