Skip to content

Commit f7bd516

Browse files
thomasp85thomasp85
authored
Merge branch 'master' into patch-ext-site
2 parents dc3b103 + 2b03e47 commit f7bd516

File tree

146 files changed

+2980
-1086
lines changed

Some content is hidden

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

146 files changed

+2980
-1086
lines changed

‎.github/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.html

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

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- master
8+
9+
name: R-CMD-check
10+
11+
# Increment this version when we want to clear cache
12+
env:
13+
cache-version: v1
14+
15+
jobs:
16+
R-CMD-check:
17+
runs-on: ${{ matrix.config.os }}
18+
19+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
config:
25+
- {os: windows-latest, r: '4.0', vdiffr: true}
26+
- {os: macOS-latest, r: '4.0', vdiffr: true}
27+
- {os: macOS-latest, r: 'devel', vdiffr: false}
28+
- {os: ubuntu-16.04, r: '4.0', vdiffr: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
29+
- {os: ubuntu-16.04, r: '3.6', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
30+
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
31+
- {os: ubuntu-16.04, r: '3.4', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
32+
- {os: ubuntu-16.04, r: '3.3', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
33+
- {os: ubuntu-16.04, r: '3.2', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
34+
35+
env:
36+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
37+
CRAN: ${{ matrix.config.cran }}
38+
# don't treat missing suggested packages as error
39+
_R_CHECK_FORCE_SUGGESTS_: false
40+
# Runs vdiffr test only on the latest version of R
41+
VDIFFR_RUN_TESTS: ${{ matrix.config.vdiffr }}
42+
VDIFFR_LOG_PATH: "../vdiffr.Rout.fail"
43+
44+
steps:
45+
- uses: actions/checkout@v2
46+
47+
- uses: r-lib/actions/setup-r@master
48+
with:
49+
r-version: ${{ matrix.config.r }}
50+
51+
- uses: r-lib/actions/setup-pandoc@master
52+
53+
- name: Query dependencies
54+
run: |
55+
install.packages('remotes')
56+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
57+
shell: Rscript {0}
58+
59+
- name: Cache R packages
60+
if: runner.os != 'Windows'
61+
uses: actions/cache@v1
62+
with:
63+
path: ${{ env.R_LIBS_USER }}
64+
key: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
65+
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-
66+
67+
- name: Install system dependencies on Linux
68+
if: runner.os == 'Linux'
69+
env:
70+
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
71+
run: |
72+
# Use cran:libgit2 PPA to avoid conflicts of libcurl4-gnutls-dev
73+
# Remove this after https://github.com/r-lib/actions/pull/97 gets merged
74+
sudo add-apt-repository ppa:cran/libgit2
75+
76+
Rscript -e "remotes::install_github('r-hub/sysreqs')"
77+
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
78+
sudo -s eval "$sysreqs"
79+
80+
- name: Install system dependencies on macOS
81+
if: runner.os == 'macOS'
82+
run: |
83+
# XQuartz is needed by vdiffr
84+
brew cask install xquartz
85+
86+
# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
87+
# - freetype (already installed, needed by systemfonts)
88+
# - cairo (not installed, needed by gdtools)
89+
# - pkg-config (not installed, needed to set proper build settings)
90+
brew install pkg-config cairo
91+
92+
# Since sf dependencies are a bit heavy, install them only when they are needed
93+
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
94+
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
95+
brew install udunits gdal
96+
fi
97+
98+
- name: Install dependencies
99+
run: |
100+
remotes::install_deps(dependencies = TRUE)
101+
remotes::install_cran("rcmdcheck")
102+
shell: Rscript {0}
103+
104+
- name: Check
105+
run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
106+
shell: Rscript {0}
107+
108+
- name: Upload check results
109+
if: failure()
110+
uses: actions/upload-artifact@master
111+
with:
112+
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
113+
path: check

‎.github/workflows/pkgdown.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
release:
6+
types: [published]
7+
8+
name: pkgdown
9+
10+
jobs:
11+
pkgdown:
12+
runs-on: macOS-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: r-lib/actions/setup-r@master
16+
- uses: r-lib/actions/setup-pandoc@master
17+
- name: Install dependencies
18+
run: |
19+
install.packages("remotes")
20+
remotes::install_deps(dependencies = TRUE)
21+
remotes::install_github("tidyverse/tidytemplate")
22+
remotes::install_dev("pkgdown")
23+
shell: Rscript {0}
24+
- name: Install package
25+
run: R CMD INSTALL .
26+
- name: Deploy package
27+
run: pkgdown::deploy_to_branch(new_process = FALSE)
28+
shell: Rscript {0}

‎.github/workflows/pr-commands.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
on:
2+
issue_comment:
3+
types: [created]
4+
name: Commands
5+
jobs:
6+
document:
7+
if: startsWith(github.event.comment.body, '/document')
8+
name: document
9+
runs-on: macOS-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: r-lib/actions/pr-fetch@master
13+
with:
14+
repo-token: ${{ secrets.GITHUB_TOKEN }}
15+
- uses: r-lib/actions/setup-r@master
16+
- name: Install dependencies
17+
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
18+
- name: Document
19+
run: Rscript -e 'roxygen2::roxygenise()'
20+
- name: commit
21+
run: |
22+
git add man/\* NAMESPACE
23+
git commit -m 'Document'
24+
- uses: r-lib/actions/pr-push@master
25+
with:
26+
repo-token: ${{ secrets.GITHUB_TOKEN }}
27+
style:
28+
if: startsWith(github.event.comment.body, '/style')
29+
name: style
30+
runs-on: macOS-latest
31+
steps:
32+
- uses: actions/checkout@v2
33+
- uses: r-lib/actions/pr-fetch@master
34+
with:
35+
repo-token: ${{ secrets.GITHUB_TOKEN }}
36+
- uses: r-lib/actions/setup-r@master
37+
- name: Install dependencies
38+
run: Rscript -e 'install.packages("styler")'
39+
- name: Style
40+
run: Rscript -e 'styler::style_pkg()'
41+
- name: commit
42+
run: |
43+
git add \*.R
44+
git commit -m 'Style'
45+
- uses: r-lib/actions/pr-push@master
46+
with:
47+
repo-token: ${{ secrets.GITHUB_TOKEN }}
48+
# A mock job just to ensure we have a successful build status
49+
finish:
50+
runs-on: ubuntu-latest
51+
steps:
52+
- run: true

‎.github/workflows/test-coverage.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- master
8+
9+
name: test-coverage
10+
11+
# Increment this version when we want to clear cache
12+
env:
13+
cache-version: v1
14+
r-version: 4.0
15+
16+
jobs:
17+
test-coverage:
18+
runs-on: macOS-latest
19+
steps:
20+
- uses: actions/checkout@v2
21+
with:
22+
r-version: ${{ env.r-version }}
23+
24+
- uses: r-lib/actions/setup-r@master
25+
26+
- uses: r-lib/actions/setup-pandoc@master
27+
28+
- name: Query dependencies
29+
run: |
30+
install.packages('remotes')
31+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
32+
shell: Rscript {0}
33+
34+
- name: Cache R packages
35+
uses: actions/cache@v1
36+
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
42+
if: runner.os == 'macOS'
43+
run: |
44+
# XQuartz is needed by vdiffr
45+
brew cask install xquartz
46+
47+
# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
48+
# - freetype (already installed, needed by systemfonts)
49+
# - cairo (not installed, needed by gdtools)
50+
# - pkg-config (not installed, needed to set proper build settings)
51+
brew install pkg-config cairo
52+
53+
# Since sf dependencies are a bit heavy, install them only when they are needed
54+
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
55+
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
56+
brew install udunits gdal
57+
fi
58+
59+
- name: Install dependencies
60+
run: |
61+
install.packages(c("remotes"))
62+
remotes::install_deps(dependencies = TRUE)
63+
remotes::install_cran("covr")
64+
shell: Rscript {0}
65+
66+
# TODO: Remove remotes::install_github() after covr > 3.5.0 is released
67+
# c.f. https://github.com/r-lib/covr/commit/cc710804aeff6f337777465bf902914197c0b713
68+
- name: Test coverage
69+
run: |
70+
remotes::install_github("r-lib/covr")
71+
covr::codecov()
72+
shell: Rscript {0}

‎.travis.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,10 @@ matrix:
88
# avoind errors due to world clock API (hopefully can be removed in future)
99
env: _R_CHECK_SYSTEM_CLOCK_=false
1010
- r: release
11-
env: VDIFFR_RUN_TESTS=true
12-
env: VDIFFR_LOG_PATH="../vdiffr.Rout.fail"
13-
before_cache:
14-
- Rscript -e 'remotes::install_cran("pkgdown")'
15-
- Rscript -e 'remotes::install_github("tidyverse/tidytemplate")'
16-
deploy:
17-
provider: script
18-
script: Rscript -e 'pkgdown::deploy_site_github(verbose = TRUE)'
19-
skip_cleanup: true
11+
env:
12+
- VDIFFR_RUN_TESTS=true
13+
- VDIFFR_LOG_PATH="../vdiffr.Rout.fail"
14+
- r: 3.6
2015
- r: 3.5
2116
- r: 3.4
2217
- r: 3.3

‎DESCRIPTION

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@ Description: A system for 'declaratively' creating graphics,
66
how to map variables to aesthetics, what graphical primitives to use,
77
and it takes care of the details.
88
Authors@R: c(
9-
person("Hadley", "Wickham", , "hadley@rstudio.com", c("aut", "cre")),
10-
person("Winston", "Chang", , role = "aut"),
9+
person("Hadley", "Wickham", , "hadley@rstudio.com", c("aut", "cre"),
10+
comment = c(ORCID = "0000-0003-4757-117X")),
11+
person("Winston", "Chang", , role = "aut",
12+
comment = c(ORCID = "0000-0002-1576-2126")),
1113
person("Lionel", "Henry", , role = "aut"),
12-
person("Thomas Lin", "Pedersen", role = "aut"),
14+
person("Thomas Lin", "Pedersen", role = "aut",
15+
comment = c(ORCID = "0000-0002-5147-4711")),
1316
person("Kohske", "Takahashi", role = "aut"),
14-
person("Claus", "Wilke", role = "aut"),
15-
person("Kara", "Woo", role = "aut"),
16-
person("Hiroaki", "Yutani", role = "aut"),
17-
person("Dewey", "Dunnington", role = "aut"),
18-
person("RStudio", role = c("cph"))
17+
person("Claus", "Wilke", role = "aut",
18+
comment = c(ORCID = "0000-0002-7470-9261")),
19+
person("Kara", "Woo", role = "aut",
20+
comment = c(ORCID = "0000-0002-5125-4188")),
21+
person("Hiroaki", "Yutani", role = "aut",
22+
comment = c(ORCID = "0000-0002-3385-7233")),
23+
person("Dewey", "Dunnington", role = "aut",
24+
comment = c(ORCID = "0000-0002-9415-4582")),
25+
person("RStudio", role = c("cph", "fnd"))
1926
)
2027
Depends:
2128
R (>= 3.2)
@@ -49,6 +56,7 @@ Suggests:
4956
nlme,
5057
profvis,
5158
quantreg,
59+
RColorBrewer,
5260
rgeos,
5361
rmarkdown,
5462
rpart,
@@ -131,6 +139,7 @@ Collate:
131139
'geom-errorbar.r'
132140
'geom-errorbarh.r'
133141
'geom-freqpoly.r'
142+
'geom-function.R'
134143
'geom-hex.r'
135144
'geom-histogram.r'
136145
'geom-hline.r'
@@ -254,6 +263,6 @@ Collate:
254263
'zxx.r'
255264
'zzz.r'
256265
VignetteBuilder: knitr
257-
RoxygenNote: 7.0.2
266+
RoxygenNote: 7.1.0
258267
Roxygen: list(markdown = TRUE)
259268
Encoding: UTF-8

0 commit comments

Comments
 (0)