Skip to content

Commit ec63832

Browse files
authored
Merge branch 'master' into joe/feature/shadow-dom-compat
2 parents 56af72b + 47df8ad commit ec63832

File tree

413 files changed

+52216
-5491
lines changed

Some content is hidden

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

413 files changed

+52216
-5491
lines changed

.Rbuildignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
^\.github$
66
^\.Rproj\.user$
77
^gt\.Rproj$
8-
^\.travis\.yml$
98
^_pkgdown\.yml$
10-
^appveyor\.yml$
119
^codecov\.yml$
1210
^README\.Rmd$
11+
^README\.md$
1312
^LICENSE\.md$
14-
^CODE_OF_CONDUCT\.md$
15-
^TODOS
1613
tests/gt-examples
1714
vignettes
15+
man/figures/.*svg$
16+
man/figures/[^m].*png$

.github/CODE_OF_CONDUCT.md

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in
6+
our community a harassment-free experience for everyone, regardless of
7+
age, body size, visible or invisible disability, ethnicity, sex
8+
characteristics, gender identity and expression, level of experience,
9+
education, socio-economic status, nationality, personal appearance,
10+
race, religion, or sexual identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open,
13+
welcoming, diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our
24+
mistakes, and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political
33+
attacks
34+
* Public or private harassment
35+
* Publishing others' private information, such as a physical or email
36+
address, without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our
43+
standards of acceptable behavior and will take appropriate and fair
44+
corrective action in response to any behavior that they deem
45+
inappropriate, threatening, offensive, or harmful.
46+
47+
Community leaders have the right and responsibility to remove, edit, or
48+
reject comments, commits, code, wiki edits, issues, and other
49+
contributions that are not aligned to this Code of Conduct, and will
50+
communicate reasons for moderation decisions when appropriate.
51+
52+
## Scope
53+
54+
This Code of Conduct applies within all community spaces, and also
55+
applies when an individual is officially representing the community in
56+
public spaces. Examples of representing our community include using an
57+
official e-mail address, posting via an official social media account,
58+
or acting as an appointed representative at an online or offline event.
59+
60+
## Enforcement
61+
62+
Instances of abusive, harassing, or otherwise unacceptable behavior may
63+
be reported to the community leaders responsible for enforcement at
64+
[rich@rstudio.com](mailto:rich@rstudio.com). All
65+
complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security
68+
of the reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in
73+
determining the consequences for any action they deem in violation of
74+
this Code of Conduct:
75+
76+
### 1. Correction
77+
78+
**Community Impact**: Use of inappropriate language or other behavior
79+
deemed unprofessional or unwelcome in the community.
80+
81+
**Consequence**: A private, written warning from community leaders,
82+
providing clarity around the nature of the violation and an explanation
83+
of why the behavior was inappropriate. A public apology may be
84+
requested.
85+
86+
### 2. Warning
87+
88+
**Community Impact**: A violation through a single incident or series of
89+
actions.
90+
91+
**Consequence**: A warning with consequences for continued behavior. No
92+
interaction with the people involved, including unsolicited interaction
93+
with those enforcing the Code of Conduct, for a specified period of
94+
time. This includes avoiding interactions in community spaces as well as
95+
external channels like social media. Violating these terms may lead to a
96+
temporary or permanent ban.
97+
98+
### 3. Temporary Ban
99+
100+
**Community Impact**: A serious violation of community standards,
101+
including sustained inappropriate behavior.
102+
103+
**Consequence**: A temporary ban from any sort of interaction or public
104+
communication with the community for a specified period of time. No
105+
public or private interaction with the people involved, including
106+
unsolicited interaction with those enforcing the Code of Conduct, is
107+
allowed during this period. Violating these terms may lead to a
108+
permanent ban.
109+
110+
### 4. Permanent Ban
111+
112+
**Community Impact**: Demonstrating a pattern of violation of community
113+
standards, including sustained inappropriate behavior, harassment of an
114+
individual, or aggression toward or disparagement of classes of
115+
individuals.
116+
117+
**Consequence**: A permanent ban from any sort of public interaction
118+
within the community.
119+
120+
## Attribution
121+
122+
This Code of Conduct is adapted from the
123+
[Contributor Covenant][homepage], version 2.0, available at
124+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
125+
126+
Community Impact Guidelines were inspired by
127+
[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
128+
129+
[homepage]: https://www.contributor-covenant.org
130+
131+
For answers to common questions about this code of conduct, see the FAQ
132+
at https://www.contributor-covenant.org/faq. Translations are available
133+
at https://www.contributor-covenant.org/translations.

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

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@ jobs:
1212
R-CMD-check:
1313
runs-on: ${{ matrix.config.os }}
1414

15-
name: ${{ matrix.config.os }} (${{ matrix.r }})
15+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
1616

1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
r:
21-
- '3.5'
22-
- '3.6'
23-
- '4.0'
2420
config:
25-
- {os: windows-latest}
26-
- {os: macOS-latest}
27-
- {os: ubuntu-16.04, rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
21+
- {os: macOS-latest, r: '3.5'}
22+
- {os: macOS-latest, r: '3.6'}
23+
- {os: macOS-latest, r: '4.0'}
24+
- {os: windows-latest, r: '3.6'}
25+
- {os: windows-latest, r: '4.0'}
26+
- {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
27+
- {os: ubuntu-16.04, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
28+
- {os: ubuntu-16.04, r: '4.0', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
2829

2930
env:
3031
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -37,27 +38,28 @@ jobs:
3738

3839
- uses: r-lib/actions/setup-r@master
3940
with:
40-
r-version: ${{ matrix.r }}
41+
r-version: ${{ matrix.config.r }}
4142

4243
- uses: r-lib/actions/setup-pandoc@master
4344

4445
- name: Query dependencies
4546
run: |
4647
install.packages('remotes')
47-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
48+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
4849
shell: Rscript {0}
4950

5051
- name: Cache R packages
5152
if: runner.os != 'Windows'
5253
uses: actions/cache@v1
5354
with:
5455
path: ${{ env.R_LIBS_USER }}
55-
key: ${{ runner.os }}-r-${{ matrix.r }}-2-${{ hashFiles('depends.Rds') }}
56-
restore-keys: ${{ runner.os }}-r-${{ matrix.r }}-2-
57-
56+
key: ${{ runner.os }}-r-${{ matrix.config.r }}-2-${{ hashFiles('.github/depends.Rds') }}
57+
restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-2-
58+
5859
- name: Problematic Pkgs
5960
shell: Rscript {0}
6061
run: |
62+
remotes::install_cran("htmltools")
6163
remotes::install_cran("ellipsis")
6264
remotes::install_cran("pillar")
6365
remotes::install_cran("ps")
@@ -73,27 +75,33 @@ jobs:
7375
sudo -s eval "$sysreqs"
7476
7577
- name: Install dependencies
76-
shell: Rscript {0}
7778
run: |
79+
if (Sys.info()[["sysname"]] == "Windows") {
80+
options(install.packages.compile.from.source = "never")
81+
}
7882
remotes::install_deps(dependencies = TRUE)
83+
remotes::install_cran("rcmdcheck")
84+
shell: Rscript {0}
7985

8086
- name: Install rcmdcheck
8187
shell: Rscript {0}
8288
run: |
8389
remotes::install_cran("rcmdcheck")
8490
8591
- name: Check
92+
env:
93+
_R_CHECK_CRAN_INCOMING_: false
94+
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
8695
shell: Rscript {0}
87-
run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
8896

8997
- name: Upload check results
9098
if: failure()
9199
uses: actions/upload-artifact@master
92100
with:
93-
name: ${{ runner.os }}-r${{ matrix.r }}-results
101+
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
94102
path: check
95103

96104
- name: Test coverage
97-
if: matrix.config.os == 'macOS-latest' && matrix.r == '3.6'
98-
shell: Rscript {0}
105+
if: matrix.config.os == 'macOS-latest' && matrix.config.r == '3.6'
99106
run: covr::codecov()
107+
shell: Rscript {0}

CODE_OF_CONDUCT.md

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

DESCRIPTION

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Type: Package
22
Package: gt
3-
Version: 0.2.1
3+
Version: 0.3.0.9000
44
Title: Easily Create Presentation-Ready Display Tables
55
Description: Build display tables from tabular data with an easy-to-use set of
66
functions. With its progressive approach, we can construct display tables
@@ -18,15 +18,16 @@ Authors@R: c(
1818
person("RStudio", role = c("cph", "fnd"))
1919
)
2020
License: MIT + file LICENSE
21-
URL: https://github.com/rstudio/gt
21+
URL: https://gt.rstudio.com/, https://github.com/rstudio/gt
2222
BugReports: https://github.com/rstudio/gt/issues
2323
Encoding: UTF-8
2424
LazyData: true
2525
ByteCompile: true
26-
RoxygenNote: 7.1.0.9000
26+
RoxygenNote: 7.1.1
2727
Depends:
2828
R (>= 3.2.0)
2929
Imports:
30+
bitops (>= 1.0.6),
3031
checkmate (>= 2.0.0),
3132
commonmark (>= 1.7),
3233
dplyr (>= 0.8.5),
@@ -76,7 +77,6 @@ Collate:
7677
'dt_source_notes.R'
7778
'dt_spanners.R'
7879
'dt_stub_df.R'
79-
'dt_stub_others.R'
8080
'dt_stubhead.R'
8181
'dt_styles.R'
8282
'dt_summary.R'
@@ -89,6 +89,7 @@ Collate:
8989
'helpers.R'
9090
'image.R'
9191
'info_tables.R'
92+
'knitr-utils.R'
9293
'location_methods.R'
9394
'modify_columns.R'
9495
'modify_rows.R'

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2018-2020
1+
YEAR: 2018-2021
22
COPYRIGHT HOLDER: RStudio, PBC

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018-2020 RStudio, PBC
3+
Copyright (c) 2018-2021 RStudio, PBC
44

55
Permission is hereby granted, free of charge, to any person
66
obtaining a copy of this software and associated documentation

0 commit comments

Comments
 (0)