Skip to content

Commit 5ea7711

Browse files
committed
github actions improvements
1 parent 0961ecc commit 5ea7711

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

.Rbuildignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@
1616
^src/.*[.](o|so|dll|dSYM|exp)$
1717
cspell.json
1818
^.*\.code-workspace
19+
20+
^vignettes
21+
^vignettes/.*\.txt$
22+
^vignettes/.*\.slurm$
23+
^vignettes/.*\.css$
24+
^vignettes/.*\.R$

.github/workflows/R-CMD-check.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,16 @@ jobs:
6060
if: runner.os == 'macOS'
6161
run: |
6262
brew install pkg-config gdal proj geos
63-
shell: bash
64-
63+
shell: bash # shell: Rscript {0}
6564
- name: Install dependencies
6665
run: |
6766
install.packages(c("remotes", "rcmdcheck"))
68-
remotes::install_version("ggplot2", version = "3.5.2")
69-
remotes::install_github("elgabbas/ecokit")
70-
remotes::install_github("hmsc-r/HMSC")
71-
remotes::install_local(".", dependencies = TRUE, upgrade = "never", Ncpus = parallel::detectCores())
67+
remotes::install_deps(dependencies = TRUE, upgrade = "never")
7268
shell: Rscript {0}
7369

7470
- name: Manual R CMD check
71+
env:
72+
_R_CHECK_FORCE_SUGGESTS_: false # skip checking for suggested packages
7573
run: |
7674
rcmdcheck::rcmdcheck(
7775
args = c("--no-manual", "--no-vignettes"), # "--as-cran",

.lintr

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
linters: linters_with_defaults(
2+
# Set pipe_consistency_linter to NULL in the defaults list
3+
defaults = list(
4+
pipe_consistency_linter = NULL,
5+
commented_code_linter = NULL,
6+
indentation_linter = NULL),
27
# absolute_path_linter(),
38
# consecutive_blank_linter = NULL,
49
# cyclocomp_linter = NULL,
@@ -17,7 +22,6 @@ linters: linters_with_defaults(
1722
brace_linter(),
1823
class_equals_linter(),
1924
commas_linter(),
20-
commented_code_linter = NULL,
2125
comparison_negation_linter(),
2226
condition_call_linter(),
2327
condition_message_linter(),
@@ -32,7 +36,6 @@ linters: linters_with_defaults(
3236
if_switch_linter(),
3337
ifelse_censor_linter(),
3438
implicit_assignment_linter(),
35-
indentation_linter = NULL,
3639
infix_spaces_linter(),
3740
inner_combine_linter(),
3841
is_numeric_linter(),
@@ -58,7 +61,6 @@ linters: linters_with_defaults(
5861
paren_body_linter(),
5962
paste_linter(),
6063
pipe_call_linter(),
61-
pipe_consistency_linter(),
6264
pipe_continuation_linter(),
6365
pipe_return_linter(),
6466
print_linter(),

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Suggests:
4545
colorRamps (>= 2.3.4),
4646
cowplot (>= 1.1.3),
4747
crayon (>= 1.5.3),
48-
data.table (>= 1.15.4),
48+
data.table (>= 1.17),
4949
devtools (>= 2.4.5),
5050
doParallel (>= 1.0.17),
5151
ecospat (>= 4.1.1),
@@ -61,7 +61,7 @@ Suggests:
6161
ggnewscale (>= 0.5.0),
6262
ggpubr (>= 0.6.0),
6363
ggtext (>= 0.1.2),
64-
ggtree (>= 3.13.0.1),
64+
ggtree (>= 3.99.2),
6565
grid (>= 4.4.1),
6666
gridExtra (>= 2.3),
6767
gridtext (>= 0.1.5),
@@ -82,7 +82,7 @@ Suggests:
8282
ncdf4 (>= 1.22),
8383
pak (>= 0.7.2),
8484
paletteer (>= 1.6.0),
85-
parallelly (>= 1.42),
85+
parallelly (>= 1.45),
8686
patchwork (>= 1.2.0),
8787
pbapply (>= 1.7.2),
8888
png (>= 0.1.8),

R/mod_ssdm_helpers.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2152,7 +2152,7 @@ fit_predict_internal <- function(
21522152
name_sd <- stringr::str_replace(
21532153
names(pred_r)[[1]], "_rep\\d+_", "_rep_sd_")
21542154
pred_r_sd <- stats::setNames(
2155-
terra::app(pred_r, "sd"), name_sd) %>%
2155+
terra::app(pred_r, stats::sd), name_sd) %>%
21562156
terra::toMemory()
21572157
dplyr::bind_rows(
21582158
pred_sub,

0 commit comments

Comments
 (0)