Skip to content

Commit 69c82ba

Browse files
authored
Merge pull request #40 from tidymodels/2023-spring-cleaning
2023 spring cleaning
2 parents 15c6a2d + 8e8bef5 commit 69c82ba

26 files changed

+346
-294
lines changed

CODE_OF_CONDUCT.md renamed to .github/CODE_OF_CONDUCT.md

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: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
#
44
# NOTE: This workflow is overkill for most R packages and
@@ -22,37 +22,40 @@ 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
# Use 3.6 to trigger usage of RTools35
2929
- {os: windows-latest, r: '3.6'}
30+
# use 4.1 to check with rtools40's older compiler
31+
- {os: windows-latest, r: '4.1'}
3032

31-
# Use older ubuntu to maximise backward compatibility
32-
- {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'}
33-
- {os: ubuntu-18.04, r: 'release'}
34-
- {os: ubuntu-18.04, r: 'oldrel-1'}
35-
- {os: ubuntu-18.04, r: 'oldrel-2'}
36-
- {os: ubuntu-18.04, r: 'oldrel-3'}
37-
- {os: ubuntu-18.04, r: 'oldrel-4'}
33+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
34+
- {os: ubuntu-latest, r: 'release'}
35+
- {os: ubuntu-latest, r: 'oldrel-1'}
36+
- {os: ubuntu-latest, r: 'oldrel-2'}
37+
- {os: ubuntu-latest, r: 'oldrel-3'}
3838

3939
env:
4040
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
4141
R_KEEP_PKG_SOURCE: yes
4242

4343
steps:
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545

46-
- uses: r-lib/actions/setup-pandoc@v1
46+
- uses: r-lib/actions/setup-pandoc@v2
4747

48-
- uses: r-lib/actions/setup-r@v1
48+
- uses: r-lib/actions/setup-r@v2
4949
with:
5050
r-version: ${{ matrix.config.r }}
5151
http-user-agent: ${{ matrix.config.http-user-agent }}
5252
use-public-rspm: true
5353

54-
- uses: r-lib/actions/setup-r-dependencies@v1
54+
- uses: r-lib/actions/setup-r-dependencies@v2
5555
with:
56-
extra-packages: rcmdcheck
56+
extra-packages: any::rcmdcheck
57+
needs: check
5758

58-
- uses: r-lib/actions/check-r-package@v1
59+
- uses: r-lib/actions/check-r-package@v2
60+
with:
61+
upload-snapshots: true

.github/workflows/pkgdown.yaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
55
branches: [main, master]
6+
pull_request:
7+
branches: [main, master]
68
release:
79
types: [published]
810
workflow_dispatch:
@@ -12,24 +14,35 @@ name: pkgdown
1214
jobs:
1315
pkgdown:
1416
runs-on: ubuntu-latest
17+
# Only restrict concurrency for non-PR jobs
18+
concurrency:
19+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
1520
env:
1621
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
22+
permissions:
23+
contents: write
1724
steps:
18-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
1926

20-
- uses: r-lib/actions/setup-pandoc@v1
27+
- uses: r-lib/actions/setup-pandoc@v2
2128

22-
- uses: r-lib/actions/setup-r@v1
29+
- uses: r-lib/actions/setup-r@v2
2330
with:
2431
use-public-rspm: true
2532

26-
- uses: r-lib/actions/setup-r-dependencies@v1
33+
- uses: r-lib/actions/setup-r-dependencies@v2
2734
with:
28-
extra-packages: pkgdown
35+
extra-packages: any::pkgdown, local::.
2936
needs: website
3037

31-
- name: Deploy package
32-
run: |
33-
git config --local user.name "$GITHUB_ACTOR"
34-
git config --local user.email "[email protected]"
35-
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
38+
- name: Build site
39+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
40+
shell: Rscript {0}
41+
42+
- name: Deploy to GitHub pages 🚀
43+
if: github.event_name != 'pull_request'
44+
uses: JamesIves/[email protected]
45+
with:
46+
clean: false
47+
branch: gh-pages
48+
folder: docs

.github/workflows/pr-commands.yaml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
issue_comment:
@@ -14,22 +14,24 @@ jobs:
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818

19-
- uses: r-lib/actions/pr-fetch@v1
19+
- uses: r-lib/actions/pr-fetch@v2
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222

23-
- uses: r-lib/actions/setup-r@v1
23+
- uses: r-lib/actions/setup-r@v2
2424
with:
2525
use-public-rspm: true
2626

27-
- uses: r-lib/actions/setup-r-dependencies@v1
27+
- uses: r-lib/actions/setup-r-dependencies@v2
2828
with:
29-
extra-packages: roxygen2
29+
extra-packages: any::roxygen2
30+
needs: pr-document
3031

3132
- name: Document
32-
run: Rscript -e 'roxygen2::roxygenise()'
33+
run: roxygen2::roxygenise()
34+
shell: Rscript {0}
3335

3436
- name: commit
3537
run: |
@@ -38,7 +40,7 @@ jobs:
3840
git add man/\* NAMESPACE
3941
git commit -m 'Document'
4042
41-
- uses: r-lib/actions/pr-push@v1
43+
- uses: r-lib/actions/pr-push@v2
4244
with:
4345
repo-token: ${{ secrets.GITHUB_TOKEN }}
4446

@@ -49,19 +51,21 @@ jobs:
4951
env:
5052
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
5153
steps:
52-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
5355

54-
- uses: r-lib/actions/pr-fetch@v1
56+
- uses: r-lib/actions/pr-fetch@v2
5557
with:
5658
repo-token: ${{ secrets.GITHUB_TOKEN }}
5759

58-
- uses: r-lib/actions/setup-r@v1
60+
- uses: r-lib/actions/setup-r@v2
5961

6062
- name: Install dependencies
61-
run: Rscript -e 'install.packages("styler")'
63+
run: install.packages("styler")
64+
shell: Rscript {0}
6265

6366
- name: Style
64-
run: Rscript -e 'styler::style_pkg()'
67+
run: styler::style_pkg()
68+
shell: Rscript {0}
6569

6670
- name: commit
6771
run: |
@@ -70,6 +74,6 @@ jobs:
7074
git add \*.R
7175
git commit -m 'Style'
7276
73-
- uses: r-lib/actions/pr-push@v1
77+
- uses: r-lib/actions/pr-push@v2
7478
with:
7579
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-coverage.yaml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
@@ -15,16 +15,36 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919

20-
- uses: r-lib/actions/setup-r@v1
20+
- uses: r-lib/actions/setup-r@v2
2121
with:
2222
use-public-rspm: true
2323

24-
- uses: r-lib/actions/setup-r-dependencies@v1
24+
- uses: r-lib/actions/setup-r-dependencies@v2
2525
with:
26-
extra-packages: covr
26+
extra-packages: any::covr
27+
needs: coverage
2728

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

DESCRIPTION

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ Package: modeldb
22
Title: Fits Models Inside the Database
33
Version: 0.2.3.9000
44
Authors@R:
5-
person("Max", "Kuhn", , "max@rstudio.com", role = c("aut", "cre"))
5+
person("Max", "Kuhn", , "max@posit.co", role = c("aut", "cre"))
66
Description: Uses 'dplyr' and 'tidyeval' to fit statistical models inside
77
the database. It currently supports KMeans and linear regression
88
models.
99
License: MIT + file LICENSE
1010
URL: https://modeldb.tidymodels.org, https://github.com/tidymodels/modeldb
1111
BugReports: https://github.com/tidymodels/modeldb/issues
1212
Depends:
13-
R (>= 3.1)
13+
R (>= 3.6)
1414
Imports:
15-
dplyr(>= 0.7),
15+
cli,
16+
dplyr (>= 0.7),
1617
ggplot2,
1718
progress,
1819
purrr,
19-
rlang,
20+
rlang (>= 1.1.1),
2021
tibble,
2122
tidypredict
2223
Suggests:
@@ -28,9 +29,11 @@ Suggests:
2829
nycflights13,
2930
rmarkdown,
3031
RSQLite,
31-
testthat (>= 2.1.0)
32+
testthat (>= 3.2.0)
3233
VignetteBuilder:
3334
knitr
3435
Config/Needs/website: tidyverse/tidytemplate
36+
Config/testthat/edition: 3
3537
Encoding: UTF-8
36-
RoxygenNote: 7.2.1.9000
38+
Roxygen: list(markdown = TRUE)
39+
RoxygenNote: 7.2.3

0 commit comments

Comments
 (0)