Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,20 @@ jobs:
fail-fast: false
matrix:
# devel only on schedule + manual dispatch; push/PR get stable only
ggplot2: ${{ fromJSON((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && '[">= 3.5.2", "devel"]' || '[">= 3.5.2"]') }}
ggplot2: ${{ fromJSON((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && '["release", "devel"]' || '["release"]') }}
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
# minimum supported ggplot2 version (see DESCRIPTION)
include:
- ggplot2: '3.5.2'
config: {os: ubuntu-latest, r: 'release'}
# current versions of some suggested packages used in the
# vignettes (e.g., ggtree, ggpattern) require ggplot2 >= 4.0.0
skip_vignettes: true

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -59,12 +66,13 @@ jobs:
extra-packages: any::rcmdcheck
needs: check

# the release version is already installed by setup-r-dependencies
- name: Install ggplot2 ${{ matrix.ggplot2 }}
run: |
install.packages("remotes")
remotes::install_version("ggplot2", version = "${{ matrix.ggplot2 }}")
shell: Rscript {0}
if: matrix.ggplot2 != 'devel'
if: matrix.ggplot2 != 'devel' && matrix.ggplot2 != 'release'

- name: Install development ggplot2
run: |
Expand All @@ -79,4 +87,8 @@ jobs:
_R_CHECK_FORCE_SUGGESTS_: 0
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
build_args: ${{ matrix.skip_vignettes && 'c("--no-manual","--no-build-vignettes")' || 'c("--no-manual","--compact-vignettes=gs+qpdf")' }}
args: ${{ matrix.skip_vignettes && 'c("--no-manual","--as-cran","--ignore-vignettes")' || 'c("--no-manual","--as-cran")' }}
# without vignettes, and with docs inherited from newer ggplot2
# versions, only errors are meaningful for the minimum version job
error-on: ${{ matrix.skip_vignettes && '"error"' || '"warning"' }}
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ LazyData: true
biocViews:
Imports:
deeptimedata,
ggplot2 (>= 3.5.0),
ggplot2 (>= 3.5.2),
utils,
ggforce,
grid,
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# deeptime (development version)

__deeptime now requires ggplot2 version 3.5.2 or higher__, matching the requirement of its ggh4x dependency.

# deeptime 2.4.0

__deeptime now requires R version 4.1 or higher__.
Expand Down
542 changes: 542 additions & 0 deletions tests/testthat/_snaps/coord_geo/stacked-scales-on-left-right-new.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
476 changes: 476 additions & 0 deletions tests/testthat/_snaps/coord_geo/stacked-scales-on-top-bottom-new.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions tests/testthat/test-guides.R
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ test_that("ggtree scale works with only fossil taxa", {
})

test_that("guide_geo works with coord_geo_radial", {
skip_if_not_installed("ggtree")
skip_if_not_installed("ape")
gg <- revts(ggtree(tree)) +
coord_geo_radial(dat = "epochs", end = 1.49 * pi,
Expand All @@ -196,6 +197,7 @@ test_that("guide_geo works with coord_geo_radial", {
})

test_that("ggtree scale works with only fossil taxa", {
skip_if_not_installed("ggtree")
skip_if_not_installed("paleotree")
gg <- ggtree(ceratopsianTreeRaia,
position = position_nudge(x = -ceratopsianTreeRaia$root.time)) +
Expand Down
Loading