Skip to content

Commit 05167de

Browse files
netiquenetique
committed
Merge branch 'master' into pr/4188
2 parents ce15ec1 + 800c5b4 commit 05167de

File tree

141 files changed

+3660
-1428
lines changed

Some content is hidden

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

141 files changed

+3660
-1428
lines changed

‎.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ visual_test
2626
^vignettes/profiling.Rmd$
2727
^cran-comments\.md$
2828
^LICENSE\.md$
29+
^vignettes/articles$

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: R-CMD-check
1010

1111
# Increment this version when we want to clear cache
1212
env:
13-
cache-version: v3
13+
cache-version: v6
1414

1515
jobs:
1616
R-CMD-check:
@@ -24,17 +24,16 @@ jobs:
2424
config:
2525
- {os: windows-latest, r: '4.0', vdiffr: true, xref: true}
2626
- {os: macOS-latest, r: '4.0', vdiffr: true, xref: true}
27-
- {os: ubuntu-16.04, r: 'devel', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
28-
- {os: ubuntu-16.04, r: '4.0', vdiffr: true, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
29-
- {os: ubuntu-16.04, r: '3.6', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
30-
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
31-
- {os: ubuntu-16.04, r: '3.4', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
32-
- {os: ubuntu-16.04, r: '3.3', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
33-
- {os: ubuntu-16.04, r: '3.2', vdiffr: false, xref: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
27+
- {os: ubuntu-18.04, r: 'devel', vdiffr: false, xref: true}
28+
- {os: ubuntu-18.04, r: '4.0', vdiffr: true, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
29+
- {os: ubuntu-18.04, r: '3.6', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
30+
- {os: ubuntu-18.04, r: '3.5', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
31+
- {os: ubuntu-18.04, r: '3.4', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
32+
- {os: ubuntu-18.04, r: '3.3', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3433

3534
env:
3635
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
37-
CRAN: ${{ matrix.config.cran }}
36+
RSPM: ${{ matrix.config.rspm }}
3837
# don't treat missing suggested packages as error
3938
_R_CHECK_FORCE_SUGGESTS_: false
4039
# Some packages might unavailable on the older versions, so let's ignore xref warnings
@@ -49,6 +48,7 @@ jobs:
4948
- uses: r-lib/actions/setup-r@master
5049
with:
5150
r-version: ${{ matrix.config.r }}
51+
http-user-agent: ${{ matrix.config.http-user-agent }}
5252

5353
- uses: r-lib/actions/setup-pandoc@master
5454

@@ -68,18 +68,17 @@ jobs:
6868

6969
- name: Install system dependencies on Linux
7070
if: runner.os == 'Linux'
71-
env:
72-
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
7371
run: |
74-
Rscript -e "remotes::install_github('r-hub/sysreqs')"
75-
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
76-
sudo -s eval "$sysreqs"
72+
while read -r cmd
73+
do
74+
eval sudo $cmd
75+
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "18.04"))')
7776
7877
- name: Install system dependencies on macOS
7978
if: runner.os == 'macOS'
8079
run: |
8180
# XQuartz is needed by vdiffr
82-
brew cask install xquartz
81+
brew install xquartz
8382
8483
# Use only binary packages
8584
echo 'options(pkgType = "binary")' >> ~/.Rprofile

‎.github/workflows/pkgdown.yaml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,45 @@ name: pkgdown
99

1010
jobs:
1111
pkgdown:
12-
runs-on: macOS-latest
12+
runs-on: ubuntu-18.04
1313
env:
14+
RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
1415
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
16+
1517
steps:
1618
- uses: actions/checkout@v2
1719

18-
- uses: r-lib/actions/setup-r@master
20+
- uses: r-lib/actions/setup-r@v1
21+
id: install-r
1922

20-
- uses: r-lib/actions/setup-pandoc@master
23+
- uses: r-lib/actions/setup-pandoc@v1
2124

22-
- name: Query dependencies
25+
- name: Install pak and query dependencies
2326
run: |
24-
install.packages('remotes')
25-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
26-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
27+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
28+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
2729
shell: Rscript {0}
2830

29-
- name: Cache R packages
30-
uses: actions/cache@v1
31+
- name: Restore R package cache
32+
uses: actions/cache@v2
3133
with:
32-
path: ${{ env.R_LIBS_USER }}
33-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
34-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
34+
path: |
35+
${{ env.R_LIBS_USER }}/*
36+
!${{ env.R_LIBS_USER }}/pak
37+
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
38+
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-
39+
40+
- name: Install system dependencies
41+
if: runner.os == 'Linux'
42+
run: |
43+
pak::local_system_requirements(execute = TRUE)
44+
pak::pkg_system_requirements("pkgdown", execute = TRUE)
45+
shell: Rscript {0}
3546

3647
- name: Install dependencies
3748
run: |
38-
remotes::install_deps(dependencies = TRUE, type = "binary")
39-
remotes::install_github("tidyverse/tidytemplate")
40-
remotes::install_dev("pkgdown")
49+
pak::local_install_dev_deps(upgrade = TRUE, dependencies = c("all", "Config/Needs/website"))
50+
pak::pkg_install("pkgdown")
4151
shell: Rscript {0}
4252

4353
- name: Install package

‎.github/workflows/pr-commands.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: r-lib/actions/pr-fetch@master
14+
- uses: r-lib/actions/pr-fetch@v1
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
17-
- uses: r-lib/actions/setup-r@master
17+
- uses: r-lib/actions/setup-r@v1
1818
- name: Install dependencies
19-
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE, type = "binary")'
19+
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
2020
- name: Document
2121
run: Rscript -e 'roxygen2::roxygenise()'
2222
- name: commit
@@ -25,7 +25,7 @@ jobs:
2525
git config --local user.name "GitHub Actions"
2626
git add man/\* NAMESPACE
2727
git commit -m 'Document'
28-
- uses: r-lib/actions/pr-push@master
28+
- uses: r-lib/actions/pr-push@v1
2929
with:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
style:
@@ -36,10 +36,10 @@ jobs:
3636
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3737
steps:
3838
- uses: actions/checkout@v2
39-
- uses: r-lib/actions/pr-fetch@master
39+
- uses: r-lib/actions/pr-fetch@v1
4040
with:
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
42-
- uses: r-lib/actions/setup-r@master
42+
- uses: r-lib/actions/setup-r@v1
4343
- name: Install dependencies
4444
run: Rscript -e 'install.packages("styler")'
4545
- name: Style
@@ -50,6 +50,6 @@ jobs:
5050
git config --local user.name "GitHub Actions"
5151
git add \*.R
5252
git commit -m 'Style'
53-
- uses: r-lib/actions/pr-push@master
53+
- uses: r-lib/actions/pr-push@v1
5454
with:
5555
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-coverage.yaml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,48 @@ name: test-coverage
1111
# Increment this version when we want to clear cache
1212
env:
1313
cache-version: v1
14-
r-version: 4.0
1514

1615
jobs:
1716
test-coverage:
18-
runs-on: macOS-latest
17+
runs-on: ubuntu-18.04
18+
env:
19+
RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
20+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
21+
1922
steps:
2023
- uses: actions/checkout@v2
21-
with:
22-
r-version: ${{ env.r-version }}
23-
24-
- uses: r-lib/actions/setup-r@master
2524

26-
- uses: r-lib/actions/setup-pandoc@master
25+
- uses: r-lib/actions/setup-r@v1
26+
id: install-r
2727

28-
- name: Query dependencies
28+
- name: Install pak and query dependencies
2929
run: |
30-
install.packages('remotes')
31-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
30+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
31+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
3232
shell: Rscript {0}
3333

34-
- name: Cache R packages
35-
uses: actions/cache@v1
34+
- name: Restore R package cache
35+
uses: actions/cache@v2
3636
with:
37-
path: ${{ env.R_LIBS_USER }}
38-
key: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-${{ hashFiles('.github/depends.Rds') }}
39-
restore-keys: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-
40-
41-
- name: Install system dependencies on macOS
37+
path: |
38+
${{ env.R_LIBS_USER }}/*
39+
!${{ env.R_LIBS_USER }}/pak
40+
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-${{ env.cache-version }}-${{ hashFiles('.github/r-depends.rds') }}
41+
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-${{ env.cache-version }}-
42+
43+
- name: Install system dependencies
44+
if: runner.os == 'Linux'
4245
run: |
43-
# XQuartz is needed by vdiffr
44-
brew cask install xquartz
46+
pak::local_system_requirements(execute = TRUE)
47+
pak::pkg_system_requirements("covr", execute = TRUE)
48+
shell: Rscript {0}
4549

4650
- name: Install dependencies
4751
run: |
48-
install.packages(c("remotes"))
49-
remotes::install_deps(dependencies = TRUE, type = "binary")
50-
remotes::install_cran("covr")
52+
pak::local_install_dev_deps(upgrade = TRUE)
53+
pak::pkg_install("covr")
5154
shell: Rscript {0}
5255

53-
# TODO: Remove remotes::install_github() after covr > 3.5.0 is released
54-
# c.f. https://github.com/r-lib/covr/commit/cc710804aeff6f337777465bf902914197c0b713
5556
- name: Test coverage
56-
run: |
57-
remotes::install_github("r-lib/covr")
58-
covr::codecov()
57+
run: covr::codecov()
5958
shell: Rscript {0}

‎DESCRIPTION

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: ggplot2
2-
Version: 3.3.2.9000
2+
Version: 3.3.3.9000
33
Title: Create Elegant Data Visualisations Using the Grammar of Graphics
44
Description: A system for 'declaratively' creating graphics,
55
based on "The Grammar of Graphics". You provide the data, tell 'ggplot2'
@@ -25,7 +25,7 @@ Authors@R: c(
2525
person("RStudio", role = c("cph", "fnd"))
2626
)
2727
Depends:
28-
R (>= 3.2)
28+
R (>= 3.3)
2929
Imports:
3030
digest,
3131
glue,
@@ -35,17 +35,19 @@ Imports:
3535
isoband,
3636
MASS,
3737
mgcv,
38-
rlang (>= 0.3.0),
38+
rlang (>= 0.4.10),
3939
scales (>= 0.5.0),
4040
stats,
4141
tibble,
4242
withr (>= 2.0.0)
4343
Suggests:
4444
covr,
45+
ragg,
4546
dplyr,
4647
ggplot2movies,
4748
hexbin,
4849
Hmisc,
50+
interp,
4951
knitr,
5052
lattice,
5153
mapproj,
@@ -66,8 +68,8 @@ Suggests:
6668
vdiffr (>= 0.3.0),
6769
xml2
6870
Enhances: sp
69-
License: GPL-2 | file LICENSE
70-
URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
71+
License: MIT + file LICENSE
72+
URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
7173
BugReports: https://github.com/tidyverse/ggplot2/issues
7274
LazyData: true
7375
Collate:
@@ -267,3 +269,9 @@ VignetteBuilder: knitr
267269
RoxygenNote: 7.1.1
268270
Roxygen: list(markdown = TRUE)
269271
Encoding: UTF-8
272+
Config/Needs/website:
273+
ggtext,
274+
tidyr,
275+
forcats,
276+
tidyverse/tidytemplate
277+

0 commit comments

Comments
 (0)