Skip to content

Commit cfa1ba9

Browse files
authored
Upkeep 2023 (#2502)
* Update RStudio -> Posit in cph and cre email * use_tidy_coc() * use_tidy_logo() * Recommend pak for dev version install in README
1 parent ea3a0d1 commit cfa1ba9

6 files changed

Lines changed: 129 additions & 27 deletions

File tree

.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 [email protected].
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

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Authors@R: c(
55
person("Hadley", "Wickham", role = "aut"),
66
person("Jim", "Hester", role = "aut"),
77
person("Winston", "Chang", role = "aut"),
8-
person("Jennifer", "Bryan", , "jenny@rstudio.com", role = c("aut", "cre"),
8+
person("Jennifer", "Bryan", , "jenny@posit.co", role = c("aut", "cre"),
99
comment = c(ORCID = "0000-0002-6983-2759")),
10-
person("RStudio", role = c("cph", "fnd"))
10+
person(given = "Posit, PBC", role = c("cph", "fnd"))
1111
)
1212
Description: Collection of package development tools.
1313
License: MIT + file LICENSE

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# devtools <img src="man/figures/logo.svg" align="right" height = 150/>
1+
# devtools <a href="https://devtools.r-lib.org/"><img src="man/figures/logo.png" align="right" height="138" /></a>
22

33
<!-- badges: start -->
44
[![R-CMD-check](https://github.com/r-lib/devtools/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-lib/devtools/actions/workflows/R-CMD-check.yaml)
@@ -17,8 +17,8 @@ Packages](https://r-pkgs.org/) is a book based around this workflow.
1717
install.packages("devtools")
1818

1919
# Or the development version from GitHub:
20-
# install.packages("devtools")
21-
devtools::install_github("r-lib/devtools")
20+
# install.packages("pak")
21+
pak::pak("r-lib/devtools")
2222
```
2323

2424
## Cheatsheet

man/devtools-package.Rd

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/figures/logo.png

19.6 KB
Loading

man/figures/logo.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)