Skip to content

Commit 55f411c

Browse files
IndrajeetPatilCopilot
IndrajeetPatil
and
Copilot
authored
fix: update snapshot, bump R minimum to 4.1, modernize GHA workflows (#152)
* fix: update snapshot, bump R minimum to 4.1, modernize GHA workflows - Update geom_signific_strict snapshot to match new ggplot2 geom_bar layer data structure (added 'order' and 'width' columns; reordered 'colour' before 'linewidth') - Bump R minimum version from 3.6.0 to 4.1.0 in DESCRIPTION, aligning with ggplot2 >= 3.5.0's own requirement - Remove R 3.6 and R 4.0 from the R-CMD-check matrix (below new minimum) - Add FORCE_JAVASCRIPT_ACTIONS_TO_NODE24=true to all workflow envs to silence Node.js 20 deprecation warnings ahead of the June 2026 deadline - Switch covr source from r-lib/covr (GitHub dev) to any::covr (CRAN) in test-coverage workflow for better stability Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: remove Twitter/X entries from author comments in DESCRIPTION R CMD CHECK now warns on unrecognized person() comment fields. Twitter is no longer a supported field; removing the entries eliminates those warnings. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs: regenerate Rd files with roxygen2 7.3.3 RoxygenNote bumped from 7.3.1 to 7.3.3 and Rd files regenerated to reflect the removal of Twitter author comment fields. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * ci: rewrite R-CMD-check matrix to use oldrel-N notation - Replace hardcoded R versions (4.1, 4.2, 4.3) with oldrel-1 through oldrel-4, mirroring r-lib/lintr; versions now auto-track as new R releases land without needing manual workflow updates - Remove redundant Windows devel/oldrel entries (covered by ubuntu) - Add concurrency group to cancel stale runs on new pushes - Add http-user-agent: release for devel to use stable package binaries - Upgrade actions/checkout v4 -> v6 (Node.js 24 native; drops need for FORCE_JAVASCRIPT_ACTIONS_TO_NODE24) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: address PR review comments - Replace checkout@v6 with checkout@v4 in check-full.yaml for consistency - Add FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true to check-full.yaml env - Replace oldrel-4 with pinned '4.1' to avoid drifting below minimum R version - Fix show.legend docs: remove inaccurate levels-related statements Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test: skip snapshot tests on R-devel Graphics engine changes in R-devel can cause snapshot mismatches unrelated to the package logic. Skip all snapshot tests (expect_snapshot and vdiffr::expect_doppelganger) when running on R-devel. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 2e52867 commit 55f411c

10 files changed

Lines changed: 64 additions & 43 deletions

File tree

‎.github/workflows/check-full.yaml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66

77
name: R-CMD-check
88

9+
concurrency:
10+
group: ${{ github.event.pull_request.number || github.run_id }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
R-CMD-check:
1115
runs-on: ${{ matrix.config.os }}
@@ -16,29 +20,23 @@ jobs:
1620
fail-fast: false
1721
matrix:
1822
config:
19-
# CRAN doesn't provide binaries for macOS on R-devel, so skip because
20-
# it will be too slow otherwise
21-
#- {os: macOS-latest, r: 'devel'}
22-
- { os: macOS-latest, r: "release" }
23-
24-
- { os: windows-latest, r: "devel" }
25-
- { os: windows-latest, r: "release" }
26-
- { os: windows-latest, r: "oldrel" }
23+
- {os: macOS-latest, r: 'release'}
24+
25+
- {os: windows-latest, r: 'release'}
2726
# use 4.1 to check with rtools40's older compiler
28-
- { os: windows-latest, r: "4.1" }
27+
- {os: windows-latest, r: '4.1'}
2928

30-
#- { os: ubuntu-latest, r: "next" }
31-
- { os: ubuntu-latest, r: "devel" }
32-
- { os: ubuntu-latest, r: "release" }
33-
- { os: ubuntu-latest, r: "4.3" }
34-
- { os: ubuntu-latest, r: "4.2" }
35-
- { os: ubuntu-latest, r: "4.1" }
36-
- { os: ubuntu-latest, r: "4.0" }
37-
- { os: ubuntu-latest, r: "3.6" }
29+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
30+
- {os: ubuntu-latest, r: 'release'}
31+
- {os: ubuntu-latest, r: 'oldrel-1'}
32+
- {os: ubuntu-latest, r: 'oldrel-2'}
33+
- {os: ubuntu-latest, r: 'oldrel-3'}
34+
- {os: ubuntu-latest, r: '4.1'}
3835

3936
env:
4037
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
4138
R_KEEP_PKG_SOURCE: yes
39+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
4240

4341
steps:
4442
- uses: actions/checkout@v4

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
16+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
1617
steps:
1718
- uses: actions/checkout@v4
1819

‎.github/workflows/pkgdown.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
env:
1818
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
19+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
1920
steps:
2021
- uses: actions/checkout@v4
2122

‎.github/workflows/test-coverage.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
16+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
1617

1718
steps:
1819
- uses: actions/checkout@v4
@@ -23,7 +24,7 @@ jobs:
2324

2425
- uses: r-lib/actions/setup-r-dependencies@v2
2526
with:
26-
extra-packages: r-lib/covr
27+
extra-packages: any::covr
2728
needs: coverage
2829

2930
- name: Test coverage

‎DESCRIPTION‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Authors@R:
88
family = "Ahlmann-Eltze",
99
role = c("aut", "cre", "ctb"),
1010
email = "artjom31415@googlemail.com",
11-
comment = c(ORCID = "0000-0002-3762-068X", Twitter = "@const_ae")),
11+
comment = c(ORCID = "0000-0002-3762-068X")),
1212
person(given = "Indrajeet",
1313
family = "Patil",
1414
role = c("aut", "ctb"),
1515
email = "patilindrajeet.science@gmail.com",
16-
comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets"))
16+
comment = c(ORCID = "0000-0003-1995-6531"))
1717
)
1818
Description: Enrich your 'ggplots' with group-wise comparisons.
1919
This package provides an easy way to indicate if two groups are
@@ -32,7 +32,7 @@ VignetteBuilder:
3232
Encoding: UTF-8
3333
Language: en-US
3434
Depends:
35-
R (>= 3.6.0)
35+
R (>= 4.1.0)
3636
Imports:
3737
ggplot2 (>= 3.5.0)
3838
Suggests:
@@ -42,6 +42,6 @@ Suggests:
4242
testthat,
4343
vdiffr (>= 1.0.7)
4444
Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate"))
45-
RoxygenNote: 7.3.1
45+
RoxygenNote: 7.3.3
4646
Config/testthat/edition: 3
4747
Config/testthat/parallel: true

‎man/ggsignif-package.Rd‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/stat_signif.Rd‎

Lines changed: 25 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/testthat/_snaps/geom_signific_strict.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
pb$data
55
Output
66
[[1]]
7-
fill x y PANEL group flipped_aes ymin ymax xmin xmax colour linewidth
8-
1 grey80 0.875 3 1 1 FALSE 0 3 0.75 1.00 NA 0.5
9-
2 grey20 1.125 5 1 3 FALSE 0 5 1.00 1.25 NA 0.5
10-
3 grey80 1.875 7 1 2 FALSE 0 7 1.75 2.00 NA 0.5
11-
4 grey20 2.125 8 1 4 FALSE 0 8 2.00 2.25 NA 0.5
12-
linetype alpha
13-
1 1 NA
14-
2 1 NA
15-
3 1 NA
16-
4 1 NA
7+
fill x y PANEL group flipped_aes ymin ymax xmin xmax order colour
8+
1 grey80 0.875 3 1 1 FALSE 0 3 0.75 1.00 1 NA
9+
2 grey20 1.125 5 1 3 FALSE 0 5 1.00 1.25 2 NA
10+
3 grey80 1.875 7 1 2 FALSE 0 7 1.75 2.00 1 NA
11+
4 grey20 2.125 8 1 4 FALSE 0 8 2.00 2.25 2 NA
12+
linewidth linetype alpha width
13+
1 0.5 1 NA 0.5
14+
2 0.5 1 NA 0.5
15+
3 0.5 1 NA 0.5
16+
4 0.5 1 NA 0.5
1717
1818
[[2]]
1919
x y xend yend annotation PANEL group shape colour textsize angle hjust

‎tests/testthat/test-geom_signific_strict.R‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
test_that("the plotting works - strict test", {
2+
skip_if(grepl("devel", R.version[["status"]], ignore.case = TRUE), "Skipping snapshot on R-devel: graphics engine may have changed")
23
library(ggplot2)
34

45
dat <- data.frame(

‎tests/testthat/test-vdiffr.R‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
test_that("plots are rendered correctly", {
2+
skip_if(grepl("devel", R.version[["status"]], ignore.case = TRUE), "Skipping snapshot on R-devel: graphics engine may have changed")
23
library(ggplot2)
34

45
set.seed(123)
@@ -89,6 +90,7 @@ test_that("plots are rendered correctly", {
8990
})
9091

9192
test_that("method which return text works - snapshot", {
93+
skip_if(grepl("devel", R.version[["status"]], ignore.case = TRUE), "Skipping snapshot on R-devel: graphics engine may have changed")
9294
magnitude_test <- function(x, y, ...) {
9395
change <- mean(y) / mean(x)
9496
p <- t.test(x, y)$p.value
@@ -122,6 +124,7 @@ test_that("method which return text works - snapshot", {
122124

123125

124126
test_that("identical annotations are plotted separetly - snapshot", {
127+
skip_if(grepl("devel", R.version[["status"]], ignore.case = TRUE), "Skipping snapshot on R-devel: graphics engine may have changed")
125128
dat <- data.frame(
126129
Group = c("S1", "S1", "S2", "S2"),
127130
Sub = c("A", "B", "A", "B"),

0 commit comments

Comments
 (0)