From 310fdc48c930ec536618495184d13f2dcbdd9763 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 10 Jul 2024 17:52:08 +0000 Subject: [PATCH] differences for PR #1690 --- 12-homework.md | 2 +- demo_lessons.md | 11 ++++++++++- fig/carpentries-venn-diagram_20200904.svg | 0 md5sum.txt | 6 +++--- setup.md | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) mode change 100755 => 100644 fig/carpentries-venn-diagram_20200904.svg diff --git a/12-homework.md b/12-homework.md index fc90aec34..13cc932cc 100644 --- a/12-homework.md +++ b/12-homework.md @@ -41,9 +41,9 @@ To prepare for our next session, please: - Data Carpentry - [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html) - [Basic Queries in SQL](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html) - - [Starting with Data in R](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html) - [Starting with Data in Python](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html) - [Dates as Data in Excel](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html) + - [Exploring and Understanding Data in R](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html) - Library Carpentry - [Working with Files and Directories in the Unix Shell](https://librarycarpentry.github.io/lc-shell/03-working-with-files-and-folders.html) - [Faceting and filtering in Open Refine](https://librarycarpentry.github.io/lc-open-refine/04-faceting-and-filtering.html) diff --git a/demo_lessons.md b/demo_lessons.md index c8d777b4b..9f99149af 100644 --- a/demo_lessons.md +++ b/demo_lessons.md @@ -66,10 +66,19 @@ Use the links below to jump to the starting points information for a particular |---------- |--------------- |--------------- |------------------------- | | [Data Organization in Spreadsheets](https://datacarpentry.org/spreadsheet-ecology-lesson/index.html) | \* [Dates as Data](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html)
\* [Quality Control](https://datacarpentry.org/spreadsheet-ecology-lesson/04-quality-control.html) | \* [Introduction](https://datacarpentry.org/spreadsheet-ecology-lesson/00-intro.html)
\* [Formatting Data Tables in Spreadsheets](https://datacarpentry.org/spreadsheet-ecology-lesson/01-format-data.html)
\* [Formatting problems](https://datacarpentry.org/spreadsheet-ecology-lesson/02-common-mistakes.html)
\* [Exporting data](https://datacarpentry.org/spreadsheet-ecology-lesson/05-exporting-data.html) | | | [Data Cleaning with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/index.html) | \* [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html) | \* [Introduction](https://datacarpentry.org/OpenRefine-ecology-lesson/01-getting-started.html) | The other episodes depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). | -| [Data Analysis and Visualization in R](https://datacarpentry.org/R-ecology-lesson/index.html) | \* [Introduction to R](https://datacarpentry.org/R-ecology-lesson/01-intro-to-r.html)
\* [Starting with Data](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html) | \* [Before We Start](https://www.datacarpentry.org/R-ecology-lesson/00-before-we-start.html) | [Manipulating Data](https://datacarpentry.org/R-ecology-lesson/03-dplyr.html) and [Data Visualization with ggplot2](https://datacarpentry.org/R-ecology-lesson/04-visualization-ggplot2.html) depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). | +| [Data Analysis and Visualization in R](https://datacarpentry.org/R-ecology-lesson/index.html) | \* [Data Visualization with ggplot2](https://datacarpentry.org/R-ecology-lesson/visualizing-ggplot.html)
\* [Exploring and Understanding Data](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html) | \* [Introduction to R and RStudio](https://datacarpentry.org/R-ecology-lesson/introduction-r-rstudio.html) | [Working with Data](https://datacarpentry.org/R-ecology-lesson/working-with-data.html) depends on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). | | [Data Management with SQL](https://www.datacarpentry.org/sql-ecology-lesson/index.html) | \* [Accessing Data With Queries](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html)
\* [Aggregating and Grouping Data](https://datacarpentry.org/sql-ecology-lesson/02-sql-aggregation.html)
\* [Combining Data With Joins](https://datacarpentry.org/sql-ecology-lesson/03-sql-joins.html) | \* [Databases using SQL](https://datacarpentry.github.io/sql-ecology-lesson/00-sql-introduction.html) | | | [Data Analysis and Visualization in Python](https://www.datacarpentry.org/python-ecology-lesson/index.html) | \* [Short Introduction to Programming](https://datacarpentry.org/python-ecology-lesson/01-short-introduction-to-Python.html)
\* [Starting with Data](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html)
\* [Indexing, Slicing, and Subsetting](https://datacarpentry.org/python-ecology-lesson/03-index-slice-subset.html)
\* [Data Types and Formats](https://datacarpentry.org/python-ecology-lesson/04-data-types-and-format.html)
\* [Combining DataFrames with Pandas](https://datacarpentry.org/python-ecology-lesson/05-merging-data.html)
\* [Data Workflows and Automation](https://datacarpentry.org/python-ecology-lesson/06-loops-and-functions.html) | \* [Before we Start](https://datacarpentry.org/python-ecology-lesson/00-before-we-start.html) | The other episodes depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). | +::::::::::::::::::::::::::::::::::::: instructor + +The following is no longer recommended for new trainees, but is eligible for trainees who have previously registered for it: + +| Lesson | Recommended Episodes | [**Not Eligible for Demos**](#ineligible) | Notes +|---------- |--------------- |--------------- |------------------------- | +| [Data Analysis and Visualization in R](https://tobyhodges.github.io/R-ecology-lesson-previous/) | \* [Introduction to R](https://tobyhodges.github.io/R-ecology-lesson-previous/01-intro-to-r.html)
\* [Starting with Data](https://tobyhodges.github.io/R-ecology-lesson-previous/02-starting-with-data.html) | \* [Before We Start](https://tobyhodges.github.io/R-ecology-lesson-previous/00-before-we-start.html) | [Manipulating Data](https://tobyhodges.github.io/R-ecology-lesson-previous/03-dplyr.html) and [Data Visualization with ggplot2](https://tobyhodges.github.io/R-ecology-lesson-previous/04-visualization-ggplot2.html) depend on actions taken earlier in the lesson - consult [_Teaching Episodes with Dependencies_](#dependencies). | + +::::::::::::::::::::::::::::::::::::: ### Data Carpentry: Genomics {#dc-genomics} diff --git a/fig/carpentries-venn-diagram_20200904.svg b/fig/carpentries-venn-diagram_20200904.svg old mode 100755 new mode 100644 diff --git a/md5sum.txt b/md5sum.txt index 9e7f64615..6bf21c9fb 100644 --- a/md5sum.txt +++ b/md5sum.txt @@ -15,7 +15,7 @@ "episodes/09-eia.md" "8c6a30032d53f8f1a3bdb4d3cdda658a" "site/built/09-eia.md" "2024-03-11" "episodes/10-coffee.md" "3d5420a721f87b8886a1b367fe3c995e" "site/built/10-coffee.md" "2024-03-11" "episodes/11-practice-teaching.md" "44856d335f7eed011d03af5a46fd16c1" "site/built/11-practice-teaching.md" "2024-03-11" -"episodes/12-homework.md" "4f1afe34e499d3b27bd65d832e545925" "site/built/12-homework.md" "2024-05-06" +"episodes/12-homework.md" "f22c06718ff9a549010d4e01f4bc17d0" "site/built/12-homework.md" "2024-07-10" "episodes/13-second-welcome.md" "73b7d80f1f8e321362d96aff903fdf51" "site/built/13-second-welcome.md" "2024-03-11" "episodes/14-checkout.md" "8f1377310ccc8e434d13fe55d833b1f0" "site/built/14-checkout.md" "2024-03-11" "episodes/15-carpentries.md" "fc5bc85c64fc311c44f5fd812e374fa5" "site/built/15-carpentries.md" "2024-07-03" @@ -34,11 +34,11 @@ "instructors/instructor-notes.md" "2f1f7f7e3fbc0ca739583e8877918100" "site/built/instructor-notes.md" "2024-03-11" "learners/training_calendar.md" "12fbac99476e0c5a47a081c9b1626b1c" "site/built/training_calendar.md" "2024-07-08" "learners/checkout.md" "d2e3a0d16bda9a2ccf07c557772b06bc" "site/built/checkout.md" "2024-06-27" -"learners/demo_lessons.md" "39702fdfb77681180e7b9d024904795a" "site/built/demo_lessons.md" "2024-04-17" +"learners/demo_lessons.md" "b4ba256cbce9e6a88aa0d7cdfb29ca65" "site/built/demo_lessons.md" "2024-07-10" "learners/demos_rubric.md" "8c372a794aca88e640cc76d3181d363b" "site/built/demos_rubric.md" "2024-06-20" "learners/members.md" "84e17620076b2093696780ef6190d3b5" "site/built/members.md" "2024-03-11" "learners/fromthelearners.md" "4c586e5f20cd951c47872439263f5745" "site/built/fromthelearners.md" "2024-03-11" "learners/reference.md" "61a622f37ef51d682c6d51a2068e086a" "site/built/reference.md" "2024-03-11" -"learners/setup.md" "5bce2b28295db23dd4f1a14a4c103876" "site/built/setup.md" "2024-03-11" +"learners/setup.md" "042264f3d7a4e98291cf4c3002ca2a32" "site/built/setup.md" "2024-07-10" "pages/partners.md" "139ebb374919c12aa04e70dc23fb36d9" "site/built/partners.md" "2024-03-11" "profiles/learner-profiles.md" "60b93493cf1da06dfd63255d73854461" "site/built/learner-profiles.md" "2024-03-11" diff --git a/setup.md b/setup.md index 4eb85e0a4..514ee19a8 100644 --- a/setup.md +++ b/setup.md @@ -48,9 +48,9 @@ If you are having trouble choosing an episode, we recommend choosing one of the - Data Carpentry - [Exploring Data with OpenRefine](https://datacarpentry.org/OpenRefine-ecology-lesson/03-exploring-data.html) - [Basic Queries in SQL](https://datacarpentry.org/sql-ecology-lesson/01-sql-basic-queries.html) - - [Starting with Data in R](https://datacarpentry.org/R-ecology-lesson/02-starting-with-data.html) - [Starting with Data in Python](https://datacarpentry.org/python-ecology-lesson/02-starting-with-data.html) - [Dates as Data in Excel](https://datacarpentry.org/spreadsheet-ecology-lesson/03-dates-as-data.html) + - [Exploring and Understanding Data in R](https://datacarpentry.org/R-ecology-lesson/how-r-thinks-about-data.html) - Library Carpentry - [Working with Files and Directories in the Unix Shell](https://librarycarpentry.github.io/lc-shell/03-working-with-files-and-folders.html) - [Faceting and filtering in Open Refine](https://librarycarpentry.github.io/lc-open-refine/04-faceting-and-filtering.html)