Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from swcarpentry:main #8

Merged
merged 11 commits into from
Jan 22, 2024
2 changes: 1 addition & 1 deletion episodes/05-data-structures-part2.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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")
```

Expand Down
8 changes: 4 additions & 4 deletions episodes/13-dplyr.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions episodes/14-tidyr.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
67 changes: 35 additions & 32 deletions renv/profiles/lesson-requirements/renv.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"R": {
"Version": "4.3.1",
"Version": "4.3.2",
"Repositories": [
{
"Name": "carpentries",
Expand Down Expand Up @@ -62,7 +62,7 @@
},
"Matrix": {
"Package": "Matrix",
"Version": "1.6-1.1",
"Version": "1.6-4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -75,7 +75,7 @@
"stats",
"utils"
],
"Hash": "1a00d4828f33a9d690806e98bd17150c"
"Hash": "d9c655b30a2edc6bb2244c1d1e8d549d"
},
"R6": {
"Package": "R6",
Expand Down Expand Up @@ -144,7 +144,7 @@
},
"bslib": {
"Package": "bslib",
"Version": "0.5.1",
"Version": "0.6.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -155,12 +155,13 @@
"htmltools",
"jquerylib",
"jsonlite",
"lifecycle",
"memoise",
"mime",
"rlang",
"sass"
],
"Hash": "283015ddfbb9d7bf15ea9f0b5698f0d9"
"Hash": "c0d8599494bc7fb408cd206bbdd9cab0"
},
"cachem": {
"Package": "cachem",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -254,9 +255,9 @@
},
"dplyr": {
"Package": "dplyr",
"Version": "1.1.3",
"Version": "1.1.4",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"R6",
Expand All @@ -273,7 +274,7 @@
"utils",
"vctrs"
],
"Hash": "e85ffbebaad5f70e1a2e2ef4302b4949"
"Hash": "fedd9d00c2944ff00a0e2696ccf048ec"
},
"ellipsis": {
"Package": "ellipsis",
Expand Down Expand Up @@ -466,7 +467,7 @@
},
"htmlwidgets": {
"Package": "htmlwidgets",
"Version": "1.6.2",
"Version": "1.6.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -477,7 +478,7 @@
"rmarkdown",
"yaml"
],
"Hash": "a865aa85bcb2697f47505bfd70422471"
"Hash": "a4040b08269c9af64554e55f514d002c"
},
"igraph": {
"Package": "igraph",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -648,7 +649,7 @@
},
"nlme": {
"Package": "nlme",
"Version": "3.1-163",
"Version": "3.1-164",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -658,7 +659,7 @@
"stats",
"utils"
],
"Hash": "8d1938040a05566f4f7a14af4feadd6b"
"Hash": "a623a2239e642806158bc4dc3f51565d"
},
"pillar": {
"Package": "pillar",
Expand Down Expand Up @@ -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",
Expand All @@ -881,7 +884,7 @@
"stringi",
"vctrs"
],
"Hash": "671a4d384ae9d32fc47a14e98bfa3dc8"
"Hash": "960e2ae9e09656611e0b8214ad543207"
},
"tibble": {
"Package": "tibble",
Expand Down Expand Up @@ -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",
Expand All @@ -974,7 +977,7 @@
},
"vctrs": {
"Package": "vctrs",
"Version": "0.6.4",
"Version": "0.6.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -984,7 +987,7 @@
"lifecycle",
"rlang"
],
"Hash": "266c1ca411266ba8f365fcc726444b87"
"Hash": "c03fa420630029418f7e6da3667aac4a"
},
"viridis": {
"Package": "viridis",
Expand Down