Skip to content

Commit 3c41084

Browse files
thomasp85thomasp85
committed
Merge branch 'master' into v3.3.4-rc
2 parents d79a2c6 + 01fe5de commit 3c41084

File tree

443 files changed

+21144
-20167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+21144
-20167
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
config:
27-
- {os: windows-latest, r: '4.0', vdiffr: true, xref: true}
28-
- {os: macOS-latest, r: '4.0', vdiffr: true, xref: true}
27+
- {os: windows-latest, r: '4.1', vdiffr: true, xref: true}
28+
- {os: macOS-latest, r: '4.1', vdiffr: true, xref: true}
2929
- {os: ubuntu-18.04, r: 'devel', vdiffr: false, xref: true}
30-
- {os: ubuntu-18.04, r: '4.0', vdiffr: true, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
31-
- {os: ubuntu-18.04, r: '3.6', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
32-
- {os: ubuntu-18.04, r: '3.5', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
33-
- {os: ubuntu-18.04, r: '3.4', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
34-
- {os: ubuntu-18.04, r: '3.3', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
30+
- {os: ubuntu-18.04, r: '4.1', vdiffr: true, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
31+
- {os: ubuntu-18.04, r: '4.0', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
32+
- {os: ubuntu-18.04, r: '3.6', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
33+
- {os: ubuntu-18.04, r: '3.5', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
34+
- {os: ubuntu-18.04, r: '3.4', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
35+
- {os: ubuntu-18.04, r: '3.3', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3536

3637
env:
3738
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true

‎DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Suggests:
6565
sf (>= 0.7-3),
6666
svglite (>= 1.2.0.9001),
6767
testthat (>= 2.1.0),
68-
vdiffr (>= 0.3.0),
68+
vdiffr (>= 1.0.0),
6969
xml2
7070
Enhances: sp
7171
License: MIT + file LICENSE

‎tests/figs/annotate/line-matches-points.svg

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎tests/figs/coord-cartesian/clip-on-by-default-only-inside-visible.svg

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎tests/figs/coord-cartesian/clip-turned-off-both-inside-and-outside-visible.svg

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎tests/figs/coord-cartesian/contract-range.svg

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)