Skip to content

Commit 087129b

Browse files
authored
Merge pull request #64 from tidymodels/spring-clean-2023
Spring clean 2023
2 parents c88b190 + 0d6755b commit 087129b

File tree

11 files changed

+68
-51
lines changed

11 files changed

+68
-51
lines changed
Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
88
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity and
10-
orientation.
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1111

1212
We pledge to act and interact in ways that contribute to an open, welcoming,
1313
diverse, inclusive, and healthy community.
@@ -21,25 +21,25 @@ community include:
2121
* Being respectful of differing opinions, viewpoints, and experiences
2222
* Giving and gracefully accepting constructive feedback
2323
* Accepting responsibility and apologizing to those affected by our mistakes,
24-
and learning from the experience
24+
and learning from the experience
2525
* Focusing on what is best not just for us as individuals, but for the overall
26-
community
26+
community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
3232
* Trolling, insulting or derogatory comments, and personal or political attacks
3333
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
3636
* Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
37+
professional setting
3838

3939
## Enforcement Responsibilities
4040

41-
Community leaders are responsible for clarifying and enforcing our standards
42-
of acceptable behavior and will take appropriate and fair corrective action in
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
4343
response to any behavior that they deem inappropriate, threatening, offensive,
4444
or harmful.
4545

@@ -50,17 +50,17 @@ decisions when appropriate.
5050

5151
## Scope
5252

53-
This Code of Conduct applies within all community spaces, and also applies
54-
when an individual is officially representing the community in public spaces.
55-
Examples of representing our community include using an official e-mail
56-
address, posting via an official social media account, or acting as an appointed
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
5757
representative at an online or offline event.
5858

5959
## Enforcement
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62-
reported to the community leaders responsible for enforcement at [INSERT CONTACT
63-
METHOD]. All complaints will be reviewed and investigated promptly and fairly.
62+
reported to the community leaders responsible for enforcement at [email protected].
63+
All complaints will be reviewed and investigated promptly and fairly.
6464

6565
All community leaders are obligated to respect the privacy and security of the
6666
reporter of any incident.
@@ -114,15 +114,13 @@ community.
114114
## Attribution
115115

116116
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
117-
version 2.0,
118-
available at https://www.contributor-covenant.org/version/2/0/
119-
code_of_conduct.html.
117+
version 2.1, available at
118+
<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
120119

121-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122-
enforcement ladder](https://github.com/mozilla/diversity).
123-
124-
[homepage]: https://www.contributor-covenant.org
120+
Community Impact Guidelines were inspired by
121+
[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
125122

126123
For answers to common questions about this code of conduct, see the FAQ at
127-
https://www.contributor-covenant.org/faq. Translations are available at https://
128-
www.contributor-covenant.org/translations.
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
config:
25-
- {os: macOS-latest, r: 'release'}
25+
- {os: macos-latest, r: 'release'}
2626

2727
- {os: windows-latest, r: 'release'}
2828

@@ -37,7 +37,7 @@ jobs:
3737
TORCH_INSTALL: 1
3838

3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141

4242
- uses: r-lib/actions/setup-pandoc@v2
4343

.github/workflows/pkgdown.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2222
TORCH_INSTALL: 1
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525

2626
- uses: r-lib/actions/setup-pandoc@v2
2727

@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Deploy to GitHub pages 🚀
4242
if: github.event_name != 'pull_request'
43-
uses: JamesIves/[email protected].4
43+
uses: JamesIves/github-pages-deploy-action@v4.4.1
4444
with:
4545
clean: false
4646
branch: gh-pages

.github/workflows/pr-commands.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818

1919
- uses: r-lib/actions/pr-fetch@v2
2020
with:
@@ -51,7 +51,7 @@ jobs:
5151
env:
5252
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
5353
steps:
54-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
5555

5656
- uses: r-lib/actions/pr-fetch@v2
5757
with:

.github/workflows/test-coverage.yaml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ name: test-coverage
1010

1111
jobs:
1212
test-coverage:
13-
runs-on: macOS-latest
13+
runs-on: ubuntu-latest
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616
TORCH_INSTALL: 1
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020

2121
- uses: r-lib/actions/setup-r@v2
2222
with:
@@ -28,5 +28,24 @@ jobs:
2828
needs: coverage
2929

3030
- name: Test coverage
31-
run: covr::codecov(quiet = FALSE)
31+
run: |
32+
covr::codecov(
33+
quiet = FALSE,
34+
clean = FALSE,
35+
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
36+
)
3237
shell: Rscript {0}
38+
39+
- name: Show testthat output
40+
if: always()
41+
run: |
42+
## --------------------------------------------------------------------
43+
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
44+
shell: bash
45+
46+
- name: Upload test results
47+
if: failure()
48+
uses: actions/upload-artifact@v3
49+
with:
50+
name: coverage-test-failures
51+
path: ${{ runner.temp }}/package

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Package: brulee
22
Title: High-Level Modeling Functions with 'torch'
33
Version: 0.2.0.9000
44
Authors@R: c(
5-
person("Max", "Kuhn", , "max@rstudio.com", role = c("aut", "cre"),
5+
person("Max", "Kuhn", , "max@posit.co", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0003-2402-136X")),
7-
person("Daniel", "Falbel", , "daniel@rstudio.com", role = "aut"),
8-
person("RStudio", role = "cph")
7+
person("Daniel", "Falbel", , "daniel@posit.co", role = "aut"),
8+
person(given = "Posit Software, PBC", role = c("cph", "fnd"))
99
)
1010
Description: Provides high-level modeling functions to define and train
1111
models using the 'torch' R package. Models include linear, logistic,
@@ -40,4 +40,4 @@ Config/testthat/edition: 3
4040
Encoding: UTF-8
4141
Language: en-US
4242
Roxygen: list(markdown = TRUE)
43-
RoxygenNote: 7.2.2
43+
RoxygenNote: 7.2.3

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2021
2-
COPYRIGHT HOLDER: RStudio
1+
YEAR: 2023
2+
COPYRIGHT HOLDER: brulee 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) 2021 RStudio
3+
Copyright (c) 2023 brulee 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

README.Rmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ knitr::opts_chunk$set(
1313
)
1414
```
1515

16-
# brulee <a href="https://brulee.tidymodels.org/"><img src="man/figures/logo.png" align="right" height="139" /></a>
16+
# brulee <a href="https://brulee.tidymodels.org/"><img src="man/figures/logo.png" align="right" height="139" alt="a dish of creme brulee on a striped background" /></a>
1717

1818
<!-- badges: start -->
1919
[![R-CMD-check](https://github.com/tidymodels/brulee/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/tidymodels/brulee/actions/workflows/R-CMD-check.yaml)
@@ -40,8 +40,8 @@ install.packages("brulee")
4040
And the development version from [GitHub](https://github.com/tidymodels/brulee) with:
4141

4242
``` r
43-
# install.packages("devtools")
44-
devtools::install_github("tidymodels/brulee")
43+
# install.packages("pak")
44+
pak::pak("tidymodels/brulee")
4545
```
4646
## Example
4747

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<!-- README.md is generated from README.Rmd. Please edit that file -->
33

4-
# brulee <a href="https://brulee.tidymodels.org/"><img src="man/figures/logo.png" align="right" height="139" /></a>
4+
# brulee <a href="https://brulee.tidymodels.org/"><img src="man/figures/logo.png" align="right" height="139" alt="a dish of creme brulee on a striped background" /></a>
55

66
<!-- badges: start -->
77

@@ -37,8 +37,8 @@ And the development version from
3737
[GitHub](https://github.com/tidymodels/brulee) with:
3838

3939
``` r
40-
# install.packages("devtools")
41-
devtools::install_github("tidymodels/brulee")
40+
# install.packages("pak")
41+
pak::pak("tidymodels/brulee")
4242
```
4343

4444
## Example

0 commit comments

Comments
 (0)