Skip to content

Commit 5bf33a2

Browse files
Upkeep 2025-09 (#2912)
1 parent aef498b commit 5bf33a2

31 files changed

Lines changed: 499 additions & 204 deletions

.github/CODE_OF_CONDUCT.md

Lines changed: 120 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,126 @@
1-
# Contributor Code of Conduct
1+
# Contributor Covenant Code of Conduct
22

3-
As contributors and maintainers of this project, we pledge to respect all people who
4-
contribute through reporting issues, posting feature requests, updating documentation,
5-
submitting pull requests or patches, and other activities.
3+
## Our Pledge
64

7-
We are committed to making participation in this project a harassment-free experience for
8-
everyone, regardless of level of experience, gender, gender identity and expression,
9-
sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1011

11-
Examples of unacceptable behavior by participants include the use of sexual language or
12-
imagery, derogatory comments or personal attacks, trolling, public or private harassment,
13-
insults, or other unprofessional conduct.
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
1414

15-
Project maintainers have the right and responsibility to remove, edit, or reject comments,
16-
commits, code, wiki edits, issues, and other contributions that are not aligned to this
17-
Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed
18-
from the project team.
15+
## Our Standards
1916

20-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
21-
opening an issue or contacting one or more of the project maintainers.
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
2219

23-
This Code of Conduct is adapted from the Contributor Covenant
24-
(http://contributor-covenant.org), version 1.0.0, available at
25-
http://contributor-covenant.org/version/1/0/0/
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 mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at codeofconduct@posit.co.
63+
All complaints will be reviewed and investigated promptly and fairly.
64+
65+
All community leaders are obligated to respect the privacy and security of the
66+
reporter of any incident.
67+
68+
## Enforcement Guidelines
69+
70+
Community leaders will follow these Community Impact Guidelines in determining
71+
the consequences for any action they deem in violation of this Code of Conduct:
72+
73+
### 1. Correction
74+
75+
**Community Impact**: Use of inappropriate language or other behavior deemed
76+
unprofessional or unwelcome in the community.
77+
78+
**Consequence**: A private, written warning from community leaders, providing
79+
clarity around the nature of the violation and an explanation of why the
80+
behavior was inappropriate. A public apology may be requested.
81+
82+
### 2. Warning
83+
84+
**Community Impact**: A violation through a single incident or series of
85+
actions.
86+
87+
**Consequence**: A warning with consequences for continued behavior. No
88+
interaction with the people involved, including unsolicited interaction with
89+
those enforcing the Code of Conduct, for a specified period of time. This
90+
includes avoiding interactions in community spaces as well as external channels
91+
like social media. Violating these terms may lead to a temporary or permanent
92+
ban.
93+
94+
### 3. Temporary Ban
95+
96+
**Community Impact**: A serious violation of community standards, including
97+
sustained inappropriate behavior.
98+
99+
**Consequence**: A temporary ban from any sort of interaction or public
100+
communication with the community for a specified period of time. No public or
101+
private interaction with the people involved, including unsolicited interaction
102+
with those enforcing the Code of Conduct, is allowed during this period.
103+
Violating these terms may lead to a permanent ban.
104+
105+
### 4. Permanent Ban
106+
107+
**Community Impact**: Demonstrating a pattern of violation of community
108+
standards, including sustained inappropriate behavior, harassment of an
109+
individual, or aggression toward or disparagement of classes of individuals.
110+
111+
**Consequence**: A permanent ban from any sort of public interaction within the
112+
community.
113+
114+
## Attribution
115+
116+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
117+
version 2.1, available at
118+
<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
119+
120+
Community Impact Guidelines were inspired by
121+
[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
122+
123+
For answers to common questions about this code of conduct, see the FAQ at
124+
<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
125+
126+
[homepage]: https://www.contributor-covenant.org

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
push:
99
branches: [main, master]
1010
pull_request:
11-
branches: [main, master]
1211

1312
name: R-CMD-check.yaml
1413

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87
release:
98
types: [published]
109
workflow_dispatch:
@@ -36,7 +35,7 @@ jobs:
3635
with:
3736
extra-packages: any::pkgdown, local::.
3837
needs: website
39-
38+
4039
- uses: r-lib/actions/setup-tinytex@v2
4140

4241
- name: Build site

.github/workflows/test-coverage.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87

98
name: test-coverage.yaml
109

@@ -39,14 +38,16 @@ jobs:
3938
clean = FALSE,
4039
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
4140
)
41+
print(cov)
4242
covr::to_cobertura(cov)
4343
shell: Rscript {0}
4444

45-
- uses: codecov/codecov-action@v4
45+
- uses: codecov/codecov-action@v5
4646
with:
47-
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
48-
file: ./cobertura.xml
49-
plugin: noop
47+
# Fail if error if not on PR, or if on PR and token is given
48+
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
49+
files: ./cobertura.xml
50+
plugins: noop
5051
disable_search: true
5152
token: ${{ secrets.CODECOV_TOKEN }}
5253

DESCRIPTION

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ License: MIT + file LICENSE
2222
URL: https://pkgdown.r-lib.org/, https://github.com/r-lib/pkgdown
2323
BugReports: https://github.com/r-lib/pkgdown/issues
2424
Depends:
25-
R (>= 4.0.0)
25+
R (>= 4.1)
2626
Imports:
2727
bslib (>= 0.5.1),
2828
callr (>= 3.7.3),
@@ -33,6 +33,7 @@ Imports:
3333
fs (>= 1.4.0),
3434
httr2 (>= 1.0.2),
3535
jsonlite,
36+
lifecycle,
3637
openssl,
3738
purrr (>= 1.0.0),
3839
ragg (>= 1.4.0),
@@ -52,7 +53,6 @@ Suggests:
5253
htmltools,
5354
htmlwidgets,
5455
knitr (>= 1.50),
55-
lifecycle,
5656
magick,
5757
methods,
5858
pkgload (>= 1.0.2),
@@ -70,8 +70,10 @@ Config/Needs/website: usethis, servr
7070
Config/potools/style: explicit
7171
Config/testthat/edition: 3
7272
Config/testthat/parallel: true
73-
Config/testthat/start-first: build-article, build-quarto-article, build-reference, build
73+
Config/testthat/start-first: build-article, build-quarto-article,
74+
build-reference, build
75+
Config/usethis/last-upkeep: 2025-09-07
7476
Encoding: UTF-8
7577
Roxygen: list(markdown = TRUE)
76-
SystemRequirements: pandoc
7778
RoxygenNote: 7.3.2
79+
SystemRequirements: pandoc

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2023
1+
YEAR: 2025
22
COPYRIGHT HOLDER: pkgdown authors

LICENSE.md

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

3-
Copyright (c) 2023 pkgdown authors
3+
Copyright (c) 2025 pkgdown authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,5 @@ export(template_navbar)
144144
export(template_reference)
145145
import(fs)
146146
import(rlang)
147+
importFrom(lifecycle,deprecated)
147148
importFrom(utils,installed.packages)

R/import-standalone-obj-type.R

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
# Standalone file: do not edit by hand
2-
# Source: <https://github.com/r-lib/rlang/blob/main/R/standalone-obj-type.R>
2+
# Source: https://github.com/r-lib/rlang/blob/HEAD/R/standalone-obj-type.R
3+
# Generated by: usethis::use_standalone("r-lib/rlang", "obj-type")
34
# ----------------------------------------------------------------------
45
#
56
# ---
67
# repo: r-lib/rlang
78
# file: standalone-obj-type.R
8-
# last-updated: 2023-05-01
9+
# last-updated: 2024-02-14
910
# license: https://unlicense.org
1011
# imports: rlang (>= 1.1.0)
1112
# ---
1213
#
1314
# ## Changelog
1415
#
16+
# 2024-02-14:
17+
# - `obj_type_friendly()` now works for S7 objects.
18+
#
1519
# 2023-05-01:
1620
# - `obj_type_friendly()` now only displays the first class of S3 objects.
1721
#
@@ -89,12 +93,11 @@ obj_type_friendly <- function(x, value = TRUE) {
8993
typeof(x),
9094
logical = "`NA`",
9195
integer = "an integer `NA`",
92-
double =
93-
if (is.nan(x)) {
94-
"`NaN`"
95-
} else {
96-
"a numeric `NA`"
97-
},
96+
double = if (is.nan(x)) {
97+
"`NaN`"
98+
} else {
99+
"a numeric `NA`"
100+
},
98101
complex = "a complex `NA`",
99102
character = "a character `NA`",
100103
.rlang_stop_unexpected_typeof(x)
@@ -267,19 +270,19 @@ vec_type_friendly <- function(x, length = FALSE) {
267270
#' Return OO type
268271
#' @param x Any R object.
269272
#' @return One of `"bare"` (for non-OO objects), `"S3"`, `"S4"`,
270-
#' `"R6"`, or `"R7"`.
273+
#' `"R6"`, or `"S7"`.
271274
#' @noRd
272275
obj_type_oo <- function(x) {
273276
if (!is.object(x)) {
274277
return("bare")
275278
}
276279

277-
class <- inherits(x, c("R6", "R7_object"), which = TRUE)
280+
class <- inherits(x, c("R6", "S7_object"), which = TRUE)
278281

279282
if (class[[1]]) {
280283
"R6"
281284
} else if (class[[2]]) {
282-
"R7"
285+
"S7"
283286
} else if (isS4(x)) {
284287
"S4"
285288
} else {
@@ -296,14 +299,16 @@ obj_type_oo <- function(x) {
296299
#' @param ... Arguments passed to [abort()].
297300
#' @inheritParams args_error_context
298301
#' @noRd
299-
stop_input_type <- function(x,
300-
what,
301-
...,
302-
allow_na = FALSE,
303-
allow_null = FALSE,
304-
show_value = TRUE,
305-
arg = caller_arg(x),
306-
call = caller_env()) {
302+
stop_input_type <- function(
303+
x,
304+
what,
305+
...,
306+
allow_na = FALSE,
307+
allow_null = FALSE,
308+
show_value = TRUE,
309+
arg = caller_arg(x),
310+
call = caller_env()
311+
) {
307312
# From standalone-cli.R
308313
cli <- env_get_list(
309314
nms = c("format_arg", "format_code"),

0 commit comments

Comments
 (0)