From fb97d3c3d52e0e42ac875c4e0bbab7810241662f Mon Sep 17 00:00:00 2001 From: "dyfan.jones" Date: Mon, 10 Feb 2025 12:40:14 +0000 Subject: [PATCH 1/3] fix http link --- cran/paws.management/R/opsworks_service.R | 2 +- cran/paws.management/man/opsworks.Rd | 2 +- cran/paws/R/paws.R | 2 +- cran/paws/man/opsworks.Rd | 2 +- paws/R/opsworks_service.R | 2 +- script/post_build_formatting.R | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cran/paws.management/R/opsworks_service.R b/cran/paws.management/R/opsworks_service.R index aa305913c..1d8a18d0a 100644 --- a/cran/paws.management/R/opsworks_service.R +++ b/cran/paws.management/R/opsworks_service.R @@ -39,7 +39,7 @@ NULL #' Node.js](https://docs.aws.amazon.com/sdk-for-javascript/) #' #' - [SDK for Python -#' (Boto)](http://docs.pythonboto.org/en/latest/ref/opsworks.html) +#' (Boto)](https://docs.pythonboto.org/en/latest/ref/opsworks.html) #' #' **Endpoints** #' diff --git a/cran/paws.management/man/opsworks.Rd b/cran/paws.management/man/opsworks.Rd index 0b4b6f23a..9588092e3 100644 --- a/cran/paws.management/man/opsworks.Rd +++ b/cran/paws.management/man/opsworks.Rd @@ -71,7 +71,7 @@ in your preferred language. For more information, see: \item \href{https://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.OpsWorks.OpsWorksClient.html}{SDK for PHP} \item \href{https://docs.aws.amazon.com/sdk-for-ruby/v2/api/}{SDK for Ruby} \item \href{https://docs.aws.amazon.com/sdk-for-javascript/}{Amazon Web Services SDK for Node.js} -\item \href{http://docs.pythonboto.org/en/latest/ref/opsworks.html}{SDK for Python (Boto)} +\item \href{https://docs.pythonboto.org/en/latest/ref/opsworks.html}{SDK for Python (Boto)} } \strong{Endpoints} diff --git a/cran/paws/R/paws.R b/cran/paws/R/paws.R index 0c47cf1fb..83b82a4f7 100644 --- a/cran/paws/R/paws.R +++ b/cran/paws/R/paws.R @@ -22712,7 +22712,7 @@ cloudwatchobservabilityaccessmanager <- function( #' Node.js](https://docs.aws.amazon.com/sdk-for-javascript/) #' #' - [SDK for Python -#' (Boto)](http://docs.pythonboto.org/en/latest/ref/opsworks.html) +#' (Boto)](https://docs.pythonboto.org/en/latest/ref/opsworks.html) #' #' **Endpoints** #' diff --git a/cran/paws/man/opsworks.Rd b/cran/paws/man/opsworks.Rd index e03bab37b..35acc4d23 100644 --- a/cran/paws/man/opsworks.Rd +++ b/cran/paws/man/opsworks.Rd @@ -71,7 +71,7 @@ in your preferred language. For more information, see: \item \href{https://docs.aws.amazon.com/aws-sdk-php/v3/api/class-Aws.OpsWorks.OpsWorksClient.html}{SDK for PHP} \item \href{https://docs.aws.amazon.com/sdk-for-ruby/v2/api/}{SDK for Ruby} \item \href{https://docs.aws.amazon.com/sdk-for-javascript/}{Amazon Web Services SDK for Node.js} -\item \href{http://docs.pythonboto.org/en/latest/ref/opsworks.html}{SDK for Python (Boto)} +\item \href{https://docs.pythonboto.org/en/latest/ref/opsworks.html}{SDK for Python (Boto)} } \strong{Endpoints} diff --git a/paws/R/opsworks_service.R b/paws/R/opsworks_service.R index aa305913c..1d8a18d0a 100644 --- a/paws/R/opsworks_service.R +++ b/paws/R/opsworks_service.R @@ -39,7 +39,7 @@ NULL #' Node.js](https://docs.aws.amazon.com/sdk-for-javascript/) #' #' - [SDK for Python -#' (Boto)](http://docs.pythonboto.org/en/latest/ref/opsworks.html) +#' (Boto)](https://docs.pythonboto.org/en/latest/ref/opsworks.html) #' #' **Endpoints** #' diff --git a/script/post_build_formatting.R b/script/post_build_formatting.R index b5be645a0..410a2be8b 100644 --- a/script/post_build_formatting.R +++ b/script/post_build_formatting.R @@ -17,7 +17,8 @@ before <- c( "#' \\*arn:aws:iam:::role/\\*/ResourceName_\\?\\*", "#' \\*arn:aws:iam:::role/pathA/pathB/ResourceName_1\\*", "#' \\*arn:aws:iam:::role/pathA/ResourceName_1\\*", - "\u2028" + "\u2028", + "http://docs.pythonboto.org" ) after <- c( @@ -32,12 +33,11 @@ after <- c( "#' \\\\emph\\{arn:aws:iam:::role/*/ResourceName_\\?\\}", "#' \\\\emph\\{arn:aws:iam:::role/pathA/pathB/ResourceName_1\\}", "#' \\\\emph\\{arn:aws:iam:::role/pathA/ResourceName_1\\}", - "" + "", + "https://docs.pythonboto.org" ) -for (i in seq_along(before)) { - paws_gsub(root = root, before = before[i], after = after[i]) -} +paws_gsub(root = root, before = before, after = after) paws_unescape_latex_post_build(root = root) paws_fix_html_span(root = root) From 381f41abed12562293440d77459097c9d5a47714 Mon Sep 17 00:00:00 2001 From: "dyfan.jones" Date: Mon, 10 Feb 2025 13:28:16 +0000 Subject: [PATCH 2/3] improve performance --- make.paws/R/sdk_helper.R | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/make.paws/R/sdk_helper.R b/make.paws/R/sdk_helper.R index 7b9420c39..63713a708 100644 --- a/make.paws/R/sdk_helper.R +++ b/make.paws/R/sdk_helper.R @@ -340,7 +340,7 @@ paws_release_sub_cat <- function(in_dir = "../cran", pkg_list = list()) { cran_comment_template <- "## Test environments -* local macOS install, R 4.2.1 +* local %s install, %s * R-hub (devel and release) * win-builder @@ -453,6 +453,8 @@ paws_build_cran_comments <- function( ] cran_comments <- sprintf( cran_comment_template, + utils::osVersion, + R.version.string, dir_info$cran_comment, dir_info$size, dir_info$downstream_info @@ -497,10 +499,12 @@ paws_gsub <- function( cran_file_gsub <- function(before, after, files) { for (file in files) { result <- readLines(file) - found <- grep(before, result) - if (length(found) > 0) { - result[found] <- gsub(before, after, result[found]) - writeLines(result, file) + for (i in seq_along(before)) { + found <- grep(before[i], result) + if (length(found) > 0) { + result[found] <- gsub(before[i], after[i], result[found]) + writeLines(result, file) + } } } } From 8363e576814d8c1ff0a4aa09484e1f9d26e2a6d7 Mon Sep 17 00:00:00 2001 From: "dyfan.jones" Date: Mon, 10 Feb 2025 14:56:33 +0000 Subject: [PATCH 3/3] update cran comments test --- make.paws/tests/testthat/test_sdk_helper.R | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/make.paws/tests/testthat/test_sdk_helper.R b/make.paws/tests/testthat/test_sdk_helper.R index daf7503ae..271206e4e 100644 --- a/make.paws/tests/testthat/test_sdk_helper.R +++ b/make.paws/tests/testthat/test_sdk_helper.R @@ -448,11 +448,19 @@ test_that("check paws_build_cran_comments", { mockery::mock_args(mock_write_line), list( list( - "## Test environments\n\n* local macOS install, R 4.2.1\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs or Notes.\nWarnings:this is a dummy warning\n\nMaintainer Notes: tarball package size: 456K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + sprintf( + "## Test environments\n\n* local %s install, %s\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs or Notes.\nWarnings:this is a dummy warning\n\nMaintainer Notes: tarball package size: 456K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + utils::osVersion, + R.version.string + ), con = "made_up/paws.cat1/cran-comments.md" ), list( - "## Test environments\n\n* local macOS install, R 4.2.1\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs, or WARNINGs.\nNotes:\nthis is a dummy note\n\nMaintainer Notes: tarball package size: 789K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + sprintf( + "## Test environments\n\n* local %s install, %s\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs, or WARNINGs.\nNotes:\nthis is a dummy note\n\nMaintainer Notes: tarball package size: 789K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + utils::osVersion, + R.version.string + ), con = "made_up/paws.cat2/cran-comments.md" ) ) @@ -513,11 +521,19 @@ test_that("check paws_build_cran_comments from cache", { mockery::mock_args(mock_write_line), list( list( - "## Test environments\n\n* local macOS install, R 4.2.1\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs or Notes.\nWarnings:this is a dummy warning\n\nMaintainer Notes: tarball package size: 456K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + sprintf( + "## Test environments\n\n* local %s install, %s\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs or Notes.\nWarnings:this is a dummy warning\n\nMaintainer Notes: tarball package size: 456K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + utils::osVersion, + R.version.string + ), con = "made_up/paws.cat1/cran-comments.md" ), list( - "## Test environments\n\n* local macOS install, R 4.2.1\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs, or WARNINGs.\nNotes:\nthis is a dummy note\n\nMaintainer Notes: tarball package size: 789K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + sprintf( + "## Test environments\n\n* local %s install, %s\n* R-hub (devel and release)\n* win-builder\n\n## R CMD check results\n\nThere were no ERRORs, or WARNINGs.\nNotes:\nthis is a dummy note\n\nMaintainer Notes: tarball package size: 789K\n\n## Downstream dependencies\n\nAll downstream dependencies ('paws') pass R CMD check.", + utils::osVersion, + R.version.string + ), con = "made_up/paws.cat2/cran-comments.md" ) )