Skip to content

Commit

Permalink
r-arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
wlandau committed Jul 24, 2024
1 parent 349ae69 commit 16ce8f9
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Add r-universe to repos
run: |
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',wlandau='https://wlandau.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Add r-universe to repos
run: |
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',wlandau='https://wlandau.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- name: Add r-universe to repos
run: |
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',wlandau='https://wlandau.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Add r-universe to repos
run: |
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
cat("\noptions(repos=c(paws='https://paws-r.r-universe.dev',wlandau='https://wlandau.r-universe.dev',CRAN ='https://cloud.r-project.org'))\n", file = "~/.Rprofile", append = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Description: In computationally demanding analysis projects,
'clustermq' by Schubert (2019) <doi:10.1093/bioinformatics/btz284>),
and 'batchtools' by Lang, Bischl, and Surmann (2017).
<doi:10.21105/joss.00135>.
Version: 0.0.6.9003
Version: 0.0.6.9004
License: MIT + file LICENSE
URL: https://wlandau.github.io/crew.aws.batch/,
https://github.com/wlandau/crew.aws.batch
Expand All @@ -34,7 +34,7 @@ Depends:
R (>= 4.0.0)
Imports:
cli (>= 3.1.0),
crew (>= 0.9.5),
crew (>= 0.9.5.9003),
paws.common (>= 0.7.0),
paws.compute,
paws.management,
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# crew.aws.batch 0.0.6.9003 (development)
# crew.aws.batch 0.0.6.9004 (development)

* Send both cancellation and termination requests to end jobs.
* Fix launcher bug/typo where parameters were supplied to container overrides.
* Add a new `all` argument to `terminate()` in the AWS Batch monitor.
* Add `r_arguments` to accept command line arguments to R.

# crew.aws.batch 0.0.6

Expand Down
2 changes: 2 additions & 0 deletions R/crew_controller_aws_batch.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ crew_controller_aws_batch <- function(
garbage_collection = FALSE,
launch_max = 5L,
processes = NULL,
r_arguments = NULL,
aws_batch_config = list(),
aws_batch_credentials = list(),
aws_batch_endpoint = NULL,
Expand Down Expand Up @@ -88,6 +89,7 @@ crew_controller_aws_batch <- function(
launch_max = launch_max,
tls = tls,
processes = processes,
r_arguments = r_arguments,
aws_batch_config = aws_batch_config,
aws_batch_credentials = aws_batch_credentials,
aws_batch_endpoint = aws_batch_endpoint,
Expand Down
11 changes: 8 additions & 3 deletions R/crew_launcher_aws_batch.R
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@
#' For more details, visit
#' <https://www.paws-r-sdk.com/docs/batch_submit_job/> and the
#' "AWS arguments" sections of this help file.
#' @param aws_batch_propagate_tags `NULL` or a nonempty list.
#' @param aws_batch_propagate_tags `NULL` or a logical of length 1.
#' For more details, visit
#' <https://www.paws-r-sdk.com/docs/batch_submit_job/> and the
#' "AWS arguments" sections of this help file.
#' @param aws_batch_timeout `NULL` or a nonempty named list.
#' For more details, visit
#' <https://www.paws-r-sdk.com/docs/batch_submit_job/> and the
#' "AWS arguments" sections of this help file.
#' @param aws_batch_tags `NULL` or a nonempty list.
#' @param aws_batch_tags `NULL` or a nonempty named list.
#' For more details, visit
#' <https://www.paws-r-sdk.com/docs/batch_submit_job/> and the
#' "AWS arguments" sections of this help file.
Expand All @@ -115,6 +115,7 @@ crew_launcher_aws_batch <- function(
launch_max = 5L,
tls = crew::crew_tls(mode = "automatic"),
processes = NULL,
r_arguments = NULL,
aws_batch_config = list(),
aws_batch_credentials = list(),
aws_batch_endpoint = NULL,
Expand Down Expand Up @@ -149,6 +150,7 @@ crew_launcher_aws_batch <- function(
launch_max = launch_max,
tls = tls,
processes = processes,
r_arguments = r_arguments,
aws_batch_config = aws_batch_config,
aws_batch_credentials = aws_batch_credentials,
aws_batch_endpoint = aws_batch_endpoint,
Expand Down Expand Up @@ -316,6 +318,7 @@ crew_class_launcher_aws_batch <- R6::R6Class(
#' @param launch_max See [crew_launcher_aws_batch()].
#' @param tls See [crew_launcher_aws_batch()].
#' @param processes See [crew_launcher_aws_batch()].
#' @param r_arguments See [crew_launcher_aws_batch()].
#' @param aws_batch_config See [crew_launcher_aws_batch()].
#' @param aws_batch_credentials See [crew_launcher_aws_batch()].
#' @param aws_batch_endpoint See [crew_launcher_aws_batch()].
Expand Down Expand Up @@ -350,6 +353,7 @@ crew_class_launcher_aws_batch <- R6::R6Class(
launch_max = NULL,
tls = NULL,
processes = NULL,
r_arguments = NULL,
aws_batch_config = NULL,
aws_batch_credentials = NULL,
aws_batch_endpoint = NULL,
Expand Down Expand Up @@ -382,7 +386,8 @@ crew_class_launcher_aws_batch <- R6::R6Class(
garbage_collection = garbage_collection,
launch_max = launch_max,
tls = tls,
processes = processes
processes = processes,
r_arguments = r_arguments
)
private$.aws_batch_config <- aws_batch_config
private$.aws_batch_credentials <- aws_batch_credentials
Expand Down
3 changes: 3 additions & 0 deletions man/crew_class_launcher_aws_batch.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions man/crew_class_monitor_aws_batch.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions man/crew_controller_aws_batch.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions man/crew_launcher_aws_batch.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 16ce8f9

Please sign in to comment.