Skip to content

Commit cf5b4df

Browse files
authored
Merge branch 'main' into deps/julia-updates
2 parents c628c4c + 32836c3 commit cf5b4df

File tree

3 files changed

+78
-17
lines changed

3 files changed

+78
-17
lines changed

.github/workflows/test-smokes.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tests a broad set of Quarto functionality that users are likely to encounter.
2-
# A failure indicates some signficant portion of functionality is likely to be broken.
2+
# A failure indicates some significant portion of functionality is likely to be broken.
33
name: Smoke Tests
44
on:
55
workflow_call:
@@ -112,9 +112,9 @@ jobs:
112112
path: |
113113
${{ env.RENV_PATHS_ROOT }}
114114
renv/library
115-
key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-1-${{ hashFiles('tests/renv.lock') }}
115+
key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-${{ hashFiles('tests/renv.lock') }}
116116
restore-keys: |
117-
${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-1-
117+
${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-
118118
119119
- name: Install missing system deps
120120
if: runner.os == 'Linux'
@@ -135,13 +135,12 @@ jobs:
135135
try(install.packages('rmarkdown', repos = c('https://rstudio.r-universe.dev', getOption('repos'))))
136136
try(install.packages('knitr', repos = c('https://yihui.r-universe.dev', getOption('repos'))))
137137
if ('${{ inputs.extra-r-packages }}' != '') {
138-
cat(sprintf("::notice::Running with the following extra R packages for pak: %s\n", "${{ inputs.extra-r-packages }}"))
138+
cat(sprintf("::notice::Running with the following extra R packages for renv: %s\n", "${{ inputs.extra-r-packages }}"))
139139
renv::install(strsplit("${{ inputs.extra-r-packages }}", split = ",")[[1]])
140140
}
141141
shell: Rscript {0}
142142
env:
143143
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
144-
RENV_CONFIG_PAK_ENABLED: TRUE
145144

146145
- name: Show R session information
147146
working-directory: tests

tests/DESCRIPTION

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
Type: tests
22
Description: Quarto tests projects
33
Depends:
4-
rmarkdown,
5-
knitr,
6-
shiny,
4+
bsicons,
5+
bslib,
6+
colorspace,
7+
DBI,
78
downlit,
8-
tidyverse,
9-
ggplot2,
9+
dplyr,
10+
DT,
11+
flextable,
1012
ggExtra,
11-
scales,
12-
kableExtra,
13+
ggplot2,
1314
gt,
14-
flextable,
15-
tibble,
16-
DT,
17-
DBI,
15+
kableExtra,
16+
knitr,
17+
openssl,
18+
renv,
19+
rmarkdown,
1820
RSQLite,
21+
scales,
22+
shiny,
23+
stats,
24+
tibble,
25+
tidyverse,
26+
tinytex,
1927
webshot2,
20-
bsicons
28+
yaml

tests/renv.lock

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,60 @@
994994
"Maintainer": "Matthew Lincoln <[email protected]>",
995995
"Repository": "RSPM"
996996
},
997+
"colorspace": {
998+
"Package": "colorspace",
999+
"Version": "2.1-2",
1000+
"Source": "Repository",
1001+
"Date": "2025-09-22",
1002+
"Title": "A Toolbox for Manipulating and Assessing Colors and Palettes",
1003+
"Authors@R": "c(person(given = \"Ross\", family = \"Ihaka\", role = \"aut\", email = \"[email protected]\"), person(given = \"Paul\", family = \"Murrell\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0002-3224-8858\")), person(given = \"Kurt\", family = \"Hornik\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0003-4198-9911\")), person(given = c(\"Jason\", \"C.\"), family = \"Fisher\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0001-9032-8912\")), person(given = \"Reto\", family = \"Stauffer\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0002-3798-5507\")), person(given = c(\"Claus\", \"O.\"), family = \"Wilke\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0002-7470-9261\")), person(given = c(\"Claire\", \"D.\"), family = \"McWhite\", role = \"aut\", email = \"[email protected]\", comment = c(ORCID = \"0000-0001-7346-3047\")), person(given = \"Achim\", family = \"Zeileis\", role = c(\"aut\", \"cre\"), email = \"[email protected]\", comment = c(ORCID = \"0000-0003-0918-3766\")))",
1004+
"Description": "Carries out mapping between assorted color spaces including RGB, HSV, HLS, CIEXYZ, CIELUV, HCL (polar CIELUV), CIELAB, and polar CIELAB. Qualitative, sequential, and diverging color palettes based on HCL colors are provided along with corresponding ggplot2 color scales. Color palette choice is aided by an interactive app (with either a Tcl/Tk or a shiny graphical user interface) and shiny apps with an HCL color picker and a color vision deficiency emulator. Plotting functions for displaying and assessing palettes include color swatches, visualizations of the HCL space, and trajectories in HCL and/or RGB spectrum. Color manipulation functions include: desaturation, lightening/darkening, mixing, and simulation of color vision deficiencies (deutanomaly, protanomaly, tritanomaly). Details can be found on the project web page at <https://colorspace.R-Forge.R-project.org/> and in the accompanying scientific paper: Zeileis et al. (2020, Journal of Statistical Software, <doi:10.18637/jss.v096.i01>).",
1005+
"Depends": [
1006+
"R (>= 3.0.0)",
1007+
"methods"
1008+
],
1009+
"Imports": [
1010+
"graphics",
1011+
"grDevices",
1012+
"stats"
1013+
],
1014+
"Suggests": [
1015+
"datasets",
1016+
"utils",
1017+
"KernSmooth",
1018+
"MASS",
1019+
"kernlab",
1020+
"mvtnorm",
1021+
"vcd",
1022+
"tcltk",
1023+
"shiny",
1024+
"shinyjs",
1025+
"ggplot2",
1026+
"dplyr",
1027+
"scales",
1028+
"grid",
1029+
"png",
1030+
"jpeg",
1031+
"knitr",
1032+
"rmarkdown",
1033+
"RColorBrewer",
1034+
"rcartocolor",
1035+
"scico",
1036+
"viridis",
1037+
"wesanderson"
1038+
],
1039+
"VignetteBuilder": "knitr",
1040+
"License": "BSD_3_clause + file LICENSE",
1041+
"URL": "https://colorspace.R-Forge.R-project.org/, https://hclwizard.org/",
1042+
"BugReports": "https://colorspace.R-Forge.R-project.org/contact.html",
1043+
"LazyData": "yes",
1044+
"Encoding": "UTF-8",
1045+
"RoxygenNote": "7.3.2",
1046+
"NeedsCompilation": "yes",
1047+
"Author": "Ross Ihaka [aut], Paul Murrell [aut] (ORCID: <https://orcid.org/0000-0002-3224-8858>), Kurt Hornik [aut] (ORCID: <https://orcid.org/0000-0003-4198-9911>), Jason C. Fisher [aut] (ORCID: <https://orcid.org/0000-0001-9032-8912>), Reto Stauffer [aut] (ORCID: <https://orcid.org/0000-0002-3798-5507>), Claus O. Wilke [aut] (ORCID: <https://orcid.org/0000-0002-7470-9261>), Claire D. McWhite [aut] (ORCID: <https://orcid.org/0000-0001-7346-3047>), Achim Zeileis [aut, cre] (ORCID: <https://orcid.org/0000-0003-0918-3766>)",
1048+
"Maintainer": "Achim Zeileis <[email protected]>",
1049+
"Repository": "P3M"
1050+
},
9971051
"colourpicker": {
9981052
"Package": "colourpicker",
9991053
"Version": "1.3.0",

0 commit comments

Comments
 (0)