Skip to content

Commit 27a5ab5

Browse files
author
Tyler Burch
committed
Merge branch 'main' into variable-fold-weights
2 parents 6da3d80 + c8cc961 commit 27a5ab5

File tree

207 files changed

+7290
-5980
lines changed

Some content is hidden

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

207 files changed

+7290
-5980
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ _cache$
1919
^CODE_OF_CONDUCT\.md$
2020
^man-roxygen$
2121
^\.vscode$
22+
^[.]?air[.]toml$

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
# usethis::use_github_action("check-standard") will install it.
77
on:
88
push:
9-
branches: [main, master, 'melodie-switch']
9+
branches: [main, master]
1010
pull_request:
11-
branches: [main, master, 'melodie-switch']
1211

1312
name: R-CMD-check.yaml
1413

@@ -57,6 +56,15 @@ jobs:
5756
extra-packages: any::rcmdcheck
5857
needs: check
5958

59+
- name: Try to install a few packages for testing
60+
run: |
61+
# from most dependency-heavy to least
62+
try(pak::pkg_install(c(
63+
"randomForest",
64+
"glmnet"
65+
)))
66+
shell: Rscript {0}
67+
6068
- uses: r-lib/actions/check-r-package@v2
6169
with:
6270
upload-snapshots: true
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Workflow derived from https://github.com/posit-dev/setup-air/tree/main/examples
2+
3+
on:
4+
# Using `pull_request_target` over `pull_request` for elevated `GITHUB_TOKEN`
5+
# privileges, otherwise we can't set `pull-requests: write` when the pull
6+
# request comes from a fork, which is our main use case (external contributors).
7+
#
8+
# `pull_request_target` runs in the context of the target branch (`main`, usually),
9+
# rather than in the context of the pull request like `pull_request` does. Due
10+
# to this, we must explicitly checkout `ref: ${{ github.event.pull_request.head.sha }}`.
11+
# This is typically frowned upon by GitHub, as it exposes you to potentially running
12+
# untrusted code in a context where you have elevated privileges, but they explicitly
13+
# call out the use case of reformatting and committing back / commenting on the PR
14+
# as a situation that should be safe (because we aren't actually running the untrusted
15+
# code, we are just treating it as passive data).
16+
# https://securitylab.github.com/resources/github-actions-preventing-pwn-requests/
17+
pull_request_target:
18+
19+
name: format-suggest.yaml
20+
21+
jobs:
22+
format-suggest:
23+
name: format-suggest
24+
runs-on: ubuntu-latest
25+
26+
permissions:
27+
# Required to push suggestion comments to the PR
28+
pull-requests: write
29+
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
ref: ${{ github.event.pull_request.head.sha }}
34+
35+
- name: Install
36+
uses: posit-dev/setup-air@v1
37+
38+
- name: Format
39+
run: air format .
40+
41+
- name: Suggest
42+
uses: reviewdog/action-suggester@v1
43+
with:
44+
level: error
45+
fail_level: error
46+
tool_name: air

.github/workflows/pkgdown.yaml

Lines changed: 0 additions & 1 deletion
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:

.github/workflows/test-coverage.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
5-
branches: [main, master, 'melodie-switch']
5+
branches: [main, master]
66
pull_request:
7-
branches: [main, master, 'melodie-switch']
87

98
name: test-coverage.yaml
109

@@ -35,14 +34,16 @@ jobs:
3534
clean = FALSE,
3635
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
3736
)
37+
print(cov)
3838
covr::to_cobertura(cov)
3939
shell: Rscript {0}
4040

41-
- uses: codecov/codecov-action@v4
41+
- uses: codecov/codecov-action@v5
4242
with:
43-
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
44-
file: ./cobertura.xml
45-
plugin: noop
43+
# Fail if error if not on PR, or if on PR and token is given
44+
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
45+
files: ./cobertura.xml
46+
plugins: noop
4647
disable_search: true
4748
token: ${{ secrets.CODECOV_TOKEN }}
4849

.vscode/extensions.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"Posit.air-vscode"
4+
]
5+
}

.vscode/settings.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
"cSpell.words": [
33
"mirai"
4-
]
5-
}
4+
],
5+
"[r]": {
6+
"editor.formatOnSave": true,
7+
"editor.defaultFormatter": "Posit.air-vscode"
8+
},
9+
"[quarto]": {
10+
"editor.formatOnSave": true,
11+
"editor.defaultFormatter": "quarto.quarto"
12+
}
13+
}

DESCRIPTION

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Package: tune
22
Title: Tidy Tuning Tools
3-
Version: 1.3.0.9005
3+
Version: 2.0.0.9000
44
Authors@R: c(
55
person("Max", "Kuhn", , "[email protected]", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0003-2402-136X")),
7-
person("Posit Software, PBC", role = c("cph", "fnd"))
7+
person("Posit Software, PBC", role = c("cph", "fnd"),
8+
comment = c(ROR = "03wc8by49"))
89
)
910
Description: The ability to tune models is important. 'tune' contains
1011
functions and classes to be used in conjunction with other
@@ -24,21 +25,20 @@ Imports:
2425
ggplot2,
2526
glue (>= 1.6.2),
2627
GPfit,
27-
hardhat (>= 1.4.0.9002),
28-
lifecycle (>= 1.0.0),
28+
hardhat (>= 1.4.2),
2929
parallel,
3030
parsnip (>= 1.2.1.9003),
3131
purrr (>= 1.0.0),
3232
recipes (>= 1.1.0.9001),
3333
rlang (>= 1.1.4),
3434
rsample (>= 1.3.0.9003),
35-
tailor,
35+
tailor (>= 0.1.0),
3636
tibble (>= 3.1.0),
3737
tidyr (>= 1.2.0),
3838
tidyselect (>= 1.1.2),
3939
vctrs (>= 0.6.1),
4040
withr,
41-
workflows (>= 1.2.0.9000),
41+
workflows (>= 1.3.0),
4242
yardstick (>= 1.3.0)
4343
Suggests:
4444
C50,
@@ -60,12 +60,7 @@ Suggests:
6060
testthat (>= 3.0.0),
6161
xgboost,
6262
xml2
63-
Remotes:
64-
tidymodels/rsample,
65-
tidymodels/tailor,
66-
tidymodels/workflows
67-
Config/Needs/website: pkgdown, tidymodels, kknn, doParallel, doFuture,
68-
tidyverse/tidytemplate
63+
Config/Needs/website: pkgdown, tidymodels, kknn, tidyverse/tidytemplate
6964
Config/testthat/edition: 3
7065
Encoding: UTF-8
7166
Language: en-US

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: tune 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 tune authors
3+
Copyright (c) 2025 tune 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

0 commit comments

Comments
 (0)