From 52e13a4d0407c1a2c38ec4e0c8ca75267279c991 Mon Sep 17 00:00:00 2001 From: Hao Ye Date: Thu, 2 Nov 2023 10:31:12 -0400 Subject: [PATCH 1/6] add instructor note, closes #870 --- instructors/instructor-notes.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/instructors/instructor-notes.md b/instructors/instructor-notes.md index de71e0484..3fefc00a7 100644 --- a/instructors/instructor-notes.md +++ b/instructors/instructor-notes.md @@ -69,6 +69,21 @@ To prevent the learners from having to re-enter their password each time they pu $ git config --global credential.helper 'cache --timeout=10000000' ``` +## RStudio Color Preview + +RStudio has a feature to preview the color for certain named colors and hexadecimal colors. This may confuse or distract learners (and instructors) who are not expecting it. + +Mainly, this is likely to come up during the episode on "Data Structures" with the following code block: + +```r +cats <- data.frame(coat = c("calico", "black", "tabby"), + weight = c(2.1, 5.0, 3.2), + likes_string = c(1, 0, 1)) +``` + +This option can be turned off an on in the following menu setting: +Tools -> Global Options -> Code -> Display -> Enable preview of named and hexadecimal colors (under "Syntax") + ## Pulling in Data The easiest way to get the data used in this lesson during a workshop is to have From 3d33c6f80f202b1afe3afbbc400ae568e2440158 Mon Sep 17 00:00:00 2001 From: Matthieu Bruneaux Date: Thu, 23 Nov 2023 20:11:58 +0200 Subject: [PATCH 2/6] Update/improve links to "Other great resources" in two episodes --- episodes/13-dplyr.Rmd | 8 ++++---- episodes/14-tidyr.Rmd | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/episodes/13-dplyr.Rmd b/episodes/13-dplyr.Rmd index 76c42badd..01f971eaf 100644 --- a/episodes/13-dplyr.Rmd +++ b/episodes/13-dplyr.Rmd @@ -470,10 +470,10 @@ lifeExp_2countries_bycontinents <- gapminder %>% ## Other great resources -- [R for Data Science](https://r4ds.had.co.nz/) -- [Data Wrangling Cheat sheet](https://www.rstudio.com/wp-content/uploads/2015/02/data-wrangling-cheatsheet.pdf) -- [Introduction to dplyr](https://dplyr.tidyverse.org/) -- [Data wrangling with R and RStudio](https://www.rstudio.com/resources/webinars/data-wrangling-with-r-and-rstudio/) +- [R for Data Science](https://r4ds.hadley.nz/) (online book) +- [Data Wrangling Cheat sheet](https://www.rstudio.com/wp-content/uploads/2015/02/data-wrangling-cheatsheet.pdf) (pdf file) +- [Introduction to dplyr](https://dplyr.tidyverse.org/) (online documentation) +- [Data wrangling with R and RStudio](https://www.rstudio.com/resources/webinars/data-wrangling-with-r-and-rstudio/) (online video) :::::::::::::::::::::::::::::::::::::::: keypoints diff --git a/episodes/14-tidyr.Rmd b/episodes/14-tidyr.Rmd index 026a7479e..a9c99bc85 100644 --- a/episodes/14-tidyr.Rmd +++ b/episodes/14-tidyr.Rmd @@ -307,10 +307,10 @@ There and back again! ## Other great resources -- [R for Data Science](https://r4ds.had.co.nz/index.html) -- [Data Wrangling Cheat sheet](https://www.rstudio.com/wp-content/uploads/2015/02/data-wrangling-cheatsheet.pdf) -- [Introduction to tidyr](https://cran.r-project.org/web/packages/tidyr/vignettes/tidy-data.html) -- [Data wrangling with R and RStudio](https://www.rstudio.com/resources/webinars/data-wrangling-with-r-and-rstudio/) +- [R for Data Science](https://r4ds.hadley.nz/) (online book) +- [Data Wrangling Cheat sheet](https://www.rstudio.com/wp-content/uploads/2015/02/data-wrangling-cheatsheet.pdf) (pdf file) +- [Introduction to tidyr](https://cran.r-project.org/web/packages/tidyr/vignettes/tidy-data.html) (online documentation) +- [Data wrangling with R and RStudio](https://www.rstudio.com/resources/webinars/data-wrangling-with-r-and-rstudio/) (online video) :::::::::::::::::::::::::::::::::::::::: keypoints From c715c46580a2366d1f6014b71dee9cfac7d1868a Mon Sep 17 00:00:00 2001 From: zkamvar Date: Tue, 5 Dec 2023 00:17:13 +0000 Subject: [PATCH 3/6] [actions] update 16 packages --- renv/profiles/lesson-requirements/renv.lock | 67 +++++++++++---------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/renv/profiles/lesson-requirements/renv.lock b/renv/profiles/lesson-requirements/renv.lock index b5e8065a8..1558d17da 100644 --- a/renv/profiles/lesson-requirements/renv.lock +++ b/renv/profiles/lesson-requirements/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.3.1", + "Version": "4.3.2", "Repositories": [ { "Name": "carpentries", @@ -62,7 +62,7 @@ }, "Matrix": { "Package": "Matrix", - "Version": "1.6-1.1", + "Version": "1.6-4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -75,7 +75,7 @@ "stats", "utils" ], - "Hash": "1a00d4828f33a9d690806e98bd17150c" + "Hash": "d9c655b30a2edc6bb2244c1d1e8d549d" }, "R6": { "Package": "R6", @@ -144,7 +144,7 @@ }, "bslib": { "Package": "bslib", - "Version": "0.5.1", + "Version": "0.6.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -155,12 +155,13 @@ "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "283015ddfbb9d7bf15ea9f0b5698f0d9" + "Hash": "c0d8599494bc7fb408cd206bbdd9cab0" }, "cachem": { "Package": "cachem", @@ -210,13 +211,13 @@ }, "cpp11": { "Package": "cpp11", - "Version": "0.4.6", + "Version": "0.4.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "707fae4bbf73697ec8d85f9d7076c061" + "Hash": "5a295d7d963cc5035284dcdbaf334f4e" }, "crayon": { "Package": "crayon", @@ -254,9 +255,9 @@ }, "dplyr": { "Package": "dplyr", - "Version": "1.1.3", + "Version": "1.1.4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -273,7 +274,7 @@ "utils", "vctrs" ], - "Hash": "e85ffbebaad5f70e1a2e2ef4302b4949" + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, "ellipsis": { "Package": "ellipsis", @@ -466,7 +467,7 @@ }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.2", + "Version": "1.6.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -477,7 +478,7 @@ "rmarkdown", "yaml" ], - "Hash": "a865aa85bcb2697f47505bfd70422471" + "Hash": "a4040b08269c9af64554e55f514d002c" }, "igraph": { "Package": "igraph", @@ -524,13 +525,13 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.7", + "Version": "1.8.8", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "methods" ], - "Hash": "266a20443ca13c65688b2116d5220f76" + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "knitr": { "Package": "knitr", @@ -576,16 +577,16 @@ }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.3", + "Version": "1.0.4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", "glue", "rlang" ], - "Hash": "001cecbeac1cff9301bdc3775ee46a86" + "Hash": "b8552d117e1b808b09a832f589b79035" }, "magrittr": { "Package": "magrittr", @@ -648,7 +649,7 @@ }, "nlme": { "Package": "nlme", - "Version": "3.1-163", + "Version": "3.1-164", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -658,7 +659,7 @@ "stats", "utils" ], - "Hash": "8d1938040a05566f4f7a14af4feadd6b" + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "pillar": { "Package": "pillar", @@ -837,40 +838,42 @@ }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" ], - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63" + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "stringi": { "Package": "stringi", - "Version": "1.7.12", + "Version": "1.8.2", "Source": "Repository", - "Repository": "RSPM", + "Repository": "https://carpentries.r-universe.dev", "Requirements": [ "R", "stats", "tools", "utils" ], - "Hash": "ca8bd84263c77310739d2cf64d84d7c9" + "Hash": "e68c45f81639001af5f1b15cd3599bbd" }, "stringr": { "Package": "stringr", - "Version": "1.5.0", + "Version": "1.5.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -881,7 +884,7 @@ "stringi", "vctrs" ], - "Hash": "671a4d384ae9d32fc47a14e98bfa3dc8" + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "tibble": { "Package": "tibble", @@ -943,13 +946,13 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.48", + "Version": "0.49", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "8f96d229b7311beb32b94cf413b13f84" + "Hash": "5ac22900ae0f386e54f1c307eca7d843" }, "tzdb": { "Package": "tzdb", @@ -974,7 +977,7 @@ }, "vctrs": { "Package": "vctrs", - "Version": "0.6.4", + "Version": "0.6.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -984,7 +987,7 @@ "lifecycle", "rlang" ], - "Hash": "266c1ca411266ba8f365fcc726444b87" + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridis": { "Package": "viridis", From 8984f86dec2a46fd9ff530845aac5017b00edb03 Mon Sep 17 00:00:00 2001 From: louise-ord <109332460+louise-ord@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:49:41 +1100 Subject: [PATCH 4/6] Update 05-data-structures-part2.Rmd Updated the url to the gapminder.csv in Challenge 3. --- episodes/05-data-structures-part2.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/05-data-structures-part2.Rmd b/episodes/05-data-structures-part2.Rmd index 6311e5fbd..cc2ec277d 100755 --- a/episodes/05-data-structures-part2.Rmd +++ b/episodes/05-data-structures-part2.Rmd @@ -347,7 +347,7 @@ script to use the function of that script without writing everything again. Check out `?source` to find out more. ```{r, eval=FALSE} -download.file("https://raw.githubusercontent.com/swcarpentry/r-novice-gapminder/gh-pages/_episodes_rmd/data/gapminder_data.csv", destfile = "data/gapminder_data.csv") +download.file("https://raw.githubusercontent.com/swcarpentry/r-novice-gapminder/main/episodes/data/gapminder_data.csv", destfile = "data/gapminder_data.csv") gapminder <- read.csv(file = "data/gapminder_data.csv") ``` From be35a8cbeee83023d1019f0b1a801c1051601849 Mon Sep 17 00:00:00 2001 From: zkamvar Date: Tue, 2 Jan 2024 00:20:04 +0000 Subject: [PATCH 5/6] [actions] update 13 packages --- renv/profiles/lesson-requirements/renv.lock | 43 +++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/renv/profiles/lesson-requirements/renv.lock b/renv/profiles/lesson-requirements/renv.lock index 1558d17da..d2e83a827 100644 --- a/renv/profiles/lesson-requirements/renv.lock +++ b/renv/profiles/lesson-requirements/renv.lock @@ -176,14 +176,14 @@ }, "cli": { "Package": "cli", - "Version": "3.6.1", + "Version": "3.6.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "89e6d8219950eac806ae0c489052048a" + "Hash": "1216ac65ac55ec0058a6f75d7ca0fd52" }, "clipr": { "Package": "clipr", @@ -300,7 +300,7 @@ }, "fansi": { "Package": "fansi", - "Version": "1.0.5", + "Version": "1.0.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -308,7 +308,7 @@ "grDevices", "utils" ], - "Hash": "3e8583a60163b4bc1a80016e63b9959e" + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", @@ -467,7 +467,7 @@ }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.3", + "Version": "1.6.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -478,11 +478,11 @@ "rmarkdown", "yaml" ], - "Hash": "a4040b08269c9af64554e55f514d002c" + "Hash": "04291cc45198225444a397606810ac37" }, "igraph": { "Package": "igraph", - "Version": "1.5.1", + "Version": "1.6.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -500,7 +500,7 @@ "stats", "utils" ], - "Hash": "80401cb5ec513e8ddc56764d03f63669" + "Hash": "eef74fe28b747e52288ea9e1d3600034" }, "isoband": { "Package": "isoband", @@ -611,7 +611,7 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.9-0", + "Version": "1.9-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -624,7 +624,7 @@ "stats", "utils" ], - "Hash": "086028ca0460d0c368028d3bda58f31b" + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", @@ -651,7 +651,7 @@ "Package": "nlme", "Version": "3.1-164", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "graphics", @@ -711,16 +711,17 @@ }, "progress": { "Package": "progress", - "Version": "1.2.2", + "Version": "1.2.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", "R6", "crayon", "hms", "prettyunits" ], - "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061" + "Hash": "f4625e061cb2865f111b47ff163a5ca6" }, "purrr": { "Package": "purrr", @@ -824,7 +825,7 @@ }, "sass": { "Package": "sass", - "Version": "0.4.7", + "Version": "0.4.8", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -834,7 +835,7 @@ "rappdirs", "rlang" ], - "Hash": "6bd4d33b50ff927191ec9acbf52fd056" + "Hash": "168f9353c76d4c4b0a0bbf72e2c2d035" }, "scales": { "Package": "scales", @@ -858,7 +859,7 @@ }, "stringi": { "Package": "stringi", - "Version": "1.8.2", + "Version": "1.8.3", "Source": "Repository", "Repository": "https://carpentries.r-universe.dev", "Requirements": [ @@ -867,7 +868,7 @@ "tools", "utils" ], - "Hash": "e68c45f81639001af5f1b15cd3599bbd" + "Hash": "058aebddea264f4c99401515182e656a" }, "stringr": { "Package": "stringr", @@ -1032,7 +1033,7 @@ }, "vroom": { "Package": "vroom", - "Version": "1.6.4", + "Version": "1.6.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1054,7 +1055,7 @@ "vctrs", "withr" ], - "Hash": "9db52c1656cf19c124f93124ea57f0fd" + "Hash": "390f9315bc0025be03012054103d227c" }, "withr": { "Package": "withr", @@ -1082,10 +1083,10 @@ }, "yaml": { "Package": "yaml", - "Version": "2.3.7", + "Version": "2.3.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "0d0056cc5383fbc240ccd0cb584bf436" + "Hash": "29240487a071f535f5e5d5a323b7afbd" } } } From 6dab42cb895d37c4a3663d84c8de20752af690ee Mon Sep 17 00:00:00 2001 From: Sehrish Kanwal Date: Fri, 12 Jan 2024 15:22:28 +1100 Subject: [PATCH 6/6] fix typo --- instructors/instructor-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instructors/instructor-notes.md b/instructors/instructor-notes.md index 3fefc00a7..83d1925ef 100644 --- a/instructors/instructor-notes.md +++ b/instructors/instructor-notes.md @@ -81,7 +81,7 @@ cats <- data.frame(coat = c("calico", "black", "tabby"), likes_string = c(1, 0, 1)) ``` -This option can be turned off an on in the following menu setting: +This option can be turned off and on in the following menu setting: Tools -> Global Options -> Code -> Display -> Enable preview of named and hexadecimal colors (under "Syntax") ## Pulling in Data